diff options
author | Alexander Aring <alex.aring@gmail.com> | 2014-03-05 08:29:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-06 17:21:38 -0500 |
commit | cefc8c8a7c9e4867c45407f7f9a44fe80c5ea58a (patch) | |
tree | cbbc0d5bf1c7c0f7cdf7e5d29b519c32217725be | |
parent | 91c69227452f6cdf3759a8af624de1f81565d5bd (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.c | 2 | ||||
-rw-r--r-- | net/ieee802154/6lowpan_iphc.c | 3 | ||||
-rw-r--r-- | net/ieee802154/6lowpan_rtnl.c | 2 | ||||
-rw-r--r-- | net/ieee802154/reassembly.c | 2 |
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 @@ | |||
27 | 27 | ||
28 | #include "6lowpan.h" | 28 | #include "6lowpan.h" |
29 | 29 | ||
30 | #include "../ieee802154/6lowpan.h" /* for the compression support */ | 30 | #include <net/6lowpan.h> /* for the compression support */ |
31 | 31 | ||
32 | #define IFACE_NAME_TEMPLATE "bt%d" | 32 | #define IFACE_NAME_TEMPLATE "bt%d" |
33 | #define EUI64_ADDR_LEN 8 | 33 | #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 @@ | |||
54 | #include <linux/if_arp.h> | 54 | #include <linux/if_arp.h> |
55 | #include <linux/module.h> | 55 | #include <linux/module.h> |
56 | #include <linux/netdevice.h> | 56 | #include <linux/netdevice.h> |
57 | #include <net/6lowpan.h> | ||
57 | #include <net/ipv6.h> | 58 | #include <net/ipv6.h> |
58 | #include <net/af_ieee802154.h> | 59 | #include <net/af_ieee802154.h> |
59 | 60 | ||
60 | #include "6lowpan.h" | ||
61 | |||
62 | /* | 61 | /* |
63 | * Uncompress address function for source and | 62 | * Uncompress address function for source and |
64 | * destination address(non-multicast). | 63 | * 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 @@ | |||
52 | #include <net/af_ieee802154.h> | 52 | #include <net/af_ieee802154.h> |
53 | #include <net/ieee802154.h> | 53 | #include <net/ieee802154.h> |
54 | #include <net/ieee802154_netdev.h> | 54 | #include <net/ieee802154_netdev.h> |
55 | #include <net/6lowpan.h> | ||
55 | #include <net/ipv6.h> | 56 | #include <net/ipv6.h> |
56 | 57 | ||
57 | #include "reassembly.h" | 58 | #include "reassembly.h" |
58 | #include "6lowpan.h" | ||
59 | 59 | ||
60 | static LIST_HEAD(lowpan_devices); | 60 | static LIST_HEAD(lowpan_devices); |
61 | 61 | ||
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 @@ | |||
24 | #include <linux/export.h> | 24 | #include <linux/export.h> |
25 | 25 | ||
26 | #include <net/ieee802154_netdev.h> | 26 | #include <net/ieee802154_netdev.h> |
27 | #include <net/6lowpan.h> | ||
27 | #include <net/ipv6.h> | 28 | #include <net/ipv6.h> |
28 | #include <net/inet_frag.h> | 29 | #include <net/inet_frag.h> |
29 | 30 | ||
30 | #include "6lowpan.h" | ||
31 | #include "reassembly.h" | 31 | #include "reassembly.h" |
32 | 32 | ||
33 | static struct inet_frags lowpan_frags; | 33 | static struct inet_frags lowpan_frags; |