summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-03-05 14:29:05 +0100
committerDavid S. Miller <davem@davemloft.net>2014-03-06 17:21:38 -0500
commitcefc8c8a7c9e4867c45407f7f9a44fe80c5ea58a (patch)
treecbbc0d5bf1c7c0f7cdf7e5d29b519c32217725be
parent91c69227452f6cdf3759a8af624de1f81565d5bd (diff)
6lowpan: move 6lowpan header to include/net
This header is used by bluetooth and ieee802154 branch. This patch move this header to the include/net directory to avoid a use of a relative path in include. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/6lowpan.h (renamed from net/ieee802154/6lowpan.h)0
-rw-r--r--net/bluetooth/6lowpan.c2
-rw-r--r--net/ieee802154/6lowpan_iphc.c3
-rw-r--r--net/ieee802154/6lowpan_rtnl.c2
-rw-r--r--net/ieee802154/reassembly.c2
5 files changed, 4 insertions, 5 deletions
diff --git a/net/ieee802154/6lowpan.h b/include/net/6lowpan.h
index f7d372b7d4ff..f7d372b7d4ff 100644
--- a/net/ieee802154/6lowpan.h
+++ b/include/net/6lowpan.h
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index adb3ea04adaa..73492b91105a 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -27,7 +27,7 @@
#include "6lowpan.h"
-#include "../ieee802154/6lowpan.h" /* for the compression support */
+#include <net/6lowpan.h> /* for the compression support */
#define IFACE_NAME_TEMPLATE "bt%d"
#define EUI64_ADDR_LEN 8
diff --git a/net/ieee802154/6lowpan_iphc.c b/net/ieee802154/6lowpan_iphc.c
index 860aa2d445ba..211b5686d719 100644
--- a/net/ieee802154/6lowpan_iphc.c
+++ b/net/ieee802154/6lowpan_iphc.c
@@ -54,11 +54,10 @@
#include <linux/if_arp.h>
#include <linux/module.h>
#include <linux/netdevice.h>
+#include <net/6lowpan.h>
#include <net/ipv6.h>
#include <net/af_ieee802154.h>
-#include "6lowpan.h"
-
/*
* Uncompress address function for source and
* destination address(non-multicast).
diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
index e4726180fc36..1bbab8952f77 100644
--- a/net/ieee802154/6lowpan_rtnl.c
+++ b/net/ieee802154/6lowpan_rtnl.c
@@ -52,10 +52,10 @@
#include <net/af_ieee802154.h>
#include <net/ieee802154.h>
#include <net/ieee802154_netdev.h>
+#include <net/6lowpan.h>
#include <net/ipv6.h>
#include "reassembly.h"
-#include "6lowpan.h"
static LIST_HEAD(lowpan_devices);
diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
index 4511fc22ef16..1cc2336eb52c 100644
--- a/net/ieee802154/reassembly.c
+++ b/net/ieee802154/reassembly.c
@@ -24,10 +24,10 @@
#include <linux/export.h>
#include <net/ieee802154_netdev.h>
+#include <net/6lowpan.h>
#include <net/ipv6.h>
#include <net/inet_frag.h>
-#include "6lowpan.h"
#include "reassembly.h"
static struct inet_frags lowpan_frags;