diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-07-25 13:37:19 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-07-26 12:28:04 +0200 |
| commit | dc98ab807ca89cfec9a6ec8b441088a4bed30c8f (patch) | |
| tree | 3b736e67bd37b57107142ef9aee9bada63d64227 | |
| parent | b3f60d891f1303de05db74c22a7c20ecddad3fae (diff) | |
| download | NetworkManager-dc98ab807ca89cfec9a6ec8b441088a4bed30c8f.tar.gz | |
platform: include "linux-headers" via "libnm-std-aux/nm-linux-compat.h"
We have our own copy of linux kernel headers, and we must never
directly include the corresponding versions from the system.
Avoid that, by only including the clones via "libnm-std-aux/nm-linux-compat.h"
and by including the compat wrapper header before other system headers.
| -rw-r--r-- | src/libnm-platform/nm-linux-platform.c | 3 | ||||
| -rw-r--r-- | src/libnm-platform/wifi/nm-wifi-utils-nl80211.c | 4 | ||||
| -rw-r--r-- | src/libnm-std-aux/nm-linux-compat.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/libnm-platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c index 26831c3718..7601db5cc2 100644 --- a/src/libnm-platform/nm-linux-platform.c +++ b/src/libnm-platform/nm-linux-platform.c @@ -7,6 +7,8 @@ #include "nm-linux-platform.h" +#include "libnm-std-aux/nm-linux-compat.h" + #include <arpa/inet.h> #include <dlfcn.h> #include <endian.h> @@ -23,7 +25,6 @@ #include <linux/if_vlan.h> #include <linux/ip6_tunnel.h> #include <linux/tc_act/tc_mirred.h> -#include <linux-headers/mptcp.h> #include <netinet/icmp6.h> #include <netinet/in.h> #include <net/if_arp.h> diff --git a/src/libnm-platform/wifi/nm-wifi-utils-nl80211.c b/src/libnm-platform/wifi/nm-wifi-utils-nl80211.c index 1875a42068..eab50f1615 100644 --- a/src/libnm-platform/wifi/nm-wifi-utils-nl80211.c +++ b/src/libnm-platform/wifi/nm-wifi-utils-nl80211.c @@ -9,14 +9,14 @@ #include "nm-wifi-utils-nl80211.h" +#include "libnm-std-aux/nm-linux-compat.h" + #include <sys/ioctl.h> #include <net/ethernet.h> #include <unistd.h> #include <linux/nl80211.h> #include <linux/if.h> -#include "linux-headers/nl80211-vnd-intel.h" - #include "libnm-log-core/nm-logging.h" #include "libnm-platform/nm-netlink.h" #include "nm-wifi-utils-private.h" diff --git a/src/libnm-std-aux/nm-linux-compat.h b/src/libnm-std-aux/nm-linux-compat.h index 7ca7ec781c..2675393d87 100644 --- a/src/libnm-std-aux/nm-linux-compat.h +++ b/src/libnm-std-aux/nm-linux-compat.h @@ -21,5 +21,7 @@ #include "linux-headers/ethtool.h" #include "linux-headers/nl802154.h" +#include "linux-headers/nl80211-vnd-intel.h" +#include "linux-headers/mptcp.h" #endif /* __NM_LINUX_COMPAT_H__ */ |