diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-10-07 21:35:58 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-10-07 21:37:56 +0200 |
| commit | 7ae2f0f6f4ac660a0941f41021a7e6e634cb1942 (patch) | |
| tree | 5c70887e7ccb29a4453990c6e2c7790c6956c57d | |
| parent | 11e3c88295a84aaeeb63b2be461f40faad41dfc8 (diff) | |
| download | NetworkManager-7ae2f0f6f4ac660a0941f41021a7e6e634cb1942.tar.gz | |
core: remove unnecessary includes to netlink/route library
We no longer use libnl-route-3 library in NetworkManager. Remove the
unnecessary includes.
(cherry picked from commit 3ceaef90fefbaf3199a8d52c5cfaa06420a81747)
| -rw-r--r-- | src/devices/nm-device.c | 1 | ||||
| -rw-r--r-- | src/platform/nm-linux-platform.c | 7 | ||||
| -rw-r--r-- | src/platform/nm-platform.c | 3 | ||||
| -rw-r--r-- | src/platform/nmp-object.c | 1 | ||||
| -rw-r--r-- | src/platform/nmp-object.h | 1 |
5 files changed, 3 insertions, 10 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 27d940c936..a100eb1284 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -33,7 +33,6 @@ #include <sys/wait.h> #include <arpa/inet.h> #include <fcntl.h> -#include <netlink/route/addr.h> #include <linux/if_addr.h> #include "nm-common-macros.h" diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 070a83ea1f..ad07078f87 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -36,12 +36,7 @@ #include <linux/if_tun.h> #include <linux/if_tunnel.h> #include <netlink/netlink.h> -#include <netlink/object.h> -#include <netlink/cache.h> -#include <netlink/route/link.h> -#include <netlink/route/link/vlan.h> -#include <netlink/route/addr.h> -#include <netlink/route/route.h> +#include <netlink/msg.h> #include <gudev/gudev.h> #include "nm-utils.h" diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 9dace69984..9274a31d59 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -28,11 +28,10 @@ #include <netinet/in.h> #include <arpa/inet.h> #include <string.h> -#include <netlink/route/addr.h> -#include <netlink/route/rtnl.h> #include <linux/ip.h> #include <linux/if_tun.h> #include <linux/if_tunnel.h> +#include <linux/rtnetlink.h> #include "nm-utils.h" #include "nm-core-internal.h" diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c index 30a52c259b..993c23d676 100644 --- a/src/platform/nmp-object.c +++ b/src/platform/nmp-object.c @@ -23,6 +23,7 @@ #include "nmp-object.h" #include <unistd.h> +#include <linux/rtnetlink.h> #include "nm-utils.h" diff --git a/src/platform/nmp-object.h b/src/platform/nmp-object.h index d295f7a078..b6d6709c4e 100644 --- a/src/platform/nmp-object.h +++ b/src/platform/nmp-object.h @@ -21,7 +21,6 @@ #ifndef __NMP_OBJECT_H__ #define __NMP_OBJECT_H__ -#include <netlink/netlink.h> #include <gudev/gudev.h> #include "nm-platform.h" |