summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Graf <tgraf@redhat.com>2011-09-23 13:46:41 +0200
committerDan Williams <dcbw@redhat.com>2011-09-30 00:18:24 -0500
commit00f2b0a9bb806be64c5868af44f43dbe55bdd75b (patch)
tree857cfab83774fc2fc4face9de0c6700612d0aaaf /include
parent61099e30f6814f9f4428f5be682aeb1d5cff33f2 (diff)
downloadNetworkManager-00f2b0a9bb806be64c5868af44f43dbe55bdd75b.tar.gz
core: Include <linux/if.h> instead of <net/if.h>
NM already includes <linux/if.h> in some places, f.e. nm-netlink-monitor and we can't mix usage of the two. Stick to using <linux/if.h> as it provides additional flag definitions such as operational link state and link mode. Signed-off-by: Thomas Graf <tgraf@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/wireless-helper.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/wireless-helper.h b/include/wireless-helper.h
index d150ef7df2..2e4509a86a 100644
--- a/include/wireless-helper.h
+++ b/include/wireless-helper.h
@@ -27,6 +27,6 @@
#include <sys/types.h>
#include <linux/types.h>
#include <sys/socket.h>
-#include <net/if.h>
+#include <linux/if.h>
#include <wireless.h>