summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-10-07 21:35:58 +0200
committerThomas Haller <thaller@redhat.com>2016-10-07 21:37:17 +0200
commit3ceaef90fefbaf3199a8d52c5cfaa06420a81747 (patch)
tree4a830afe66aa3fcd08c994af9877573cfe903dc3
parent1213a47faf37c558f083de09949e6f0c192201e3 (diff)
downloadNetworkManager-3ceaef90fefbaf3199a8d52c5cfaa06420a81747.tar.gz
core: remove unnecessary includes to netlink/route library
We no longer use libnl-route-3 library in NetworkManager. Remove the unnecessary includes.
-rw-r--r--src/devices/nm-device.c1
-rw-r--r--src/platform/nm-linux-platform.c7
-rw-r--r--src/platform/nm-platform.c3
-rw-r--r--src/platform/nmp-object.c1
-rw-r--r--src/platform/nmp-object.h1
5 files changed, 3 insertions, 10 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 941f9ade84..c424aa3194 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 9a22f02910..89a8db22de 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 342736cf0f..01bdcf3e4a 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 0bcbe2afcf..48cec7bf74 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"