diff options
author | Alexander Aring <alex.aring@gmail.com> | 2014-10-25 03:41:04 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-10-25 15:39:57 -0400 |
commit | 4ca24aca55fe1e2a61f3ffaac9015d9c45204729 (patch) | |
tree | e3b263954c1a572bd683763cab9bc37688bcc2c6 /net/ieee802154 | |
parent | 86d52cd96414f05c4053fb264a85309772c6ae26 (diff) |
ieee802154: move ieee802154 header
This patch moves the ieee802154 header into include/linux instead
include/net. Similar like wireless which have the ieee80211 header
inside of include/linux.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Cc: Alan Ott <alan@signal11.us>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/ieee802154')
-rw-r--r-- | net/ieee802154/6lowpan_rtnl.c | 2 | ||||
-rw-r--r-- | net/ieee802154/dgram.c | 2 | ||||
-rw-r--r-- | net/ieee802154/header_ops.c | 3 | ||||
-rw-r--r-- | net/ieee802154/nl-mac.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c index 0c1a49b51e57..1779a08d110a 100644 --- a/net/ieee802154/6lowpan_rtnl.c +++ b/net/ieee802154/6lowpan_rtnl.c | |||
@@ -49,8 +49,8 @@ | |||
49 | #include <linux/module.h> | 49 | #include <linux/module.h> |
50 | #include <linux/moduleparam.h> | 50 | #include <linux/moduleparam.h> |
51 | #include <linux/netdevice.h> | 51 | #include <linux/netdevice.h> |
52 | #include <linux/ieee802154.h> | ||
52 | #include <net/af_ieee802154.h> | 53 | #include <net/af_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/6lowpan.h> |
56 | #include <net/ipv6.h> | 56 | #include <net/ipv6.h> |
diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c index 71e99a0994e1..3d58befef467 100644 --- a/net/ieee802154/dgram.c +++ b/net/ieee802154/dgram.c | |||
@@ -23,9 +23,9 @@ | |||
23 | #include <linux/if_arp.h> | 23 | #include <linux/if_arp.h> |
24 | #include <linux/list.h> | 24 | #include <linux/list.h> |
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/ieee802154.h> | ||
26 | #include <net/sock.h> | 27 | #include <net/sock.h> |
27 | #include <net/af_ieee802154.h> | 28 | #include <net/af_ieee802154.h> |
28 | #include <net/ieee802154.h> | ||
29 | #include <net/ieee802154_netdev.h> | 29 | #include <net/ieee802154_netdev.h> |
30 | 30 | ||
31 | #include <asm/ioctls.h> | 31 | #include <asm/ioctls.h> |
diff --git a/net/ieee802154/header_ops.c b/net/ieee802154/header_ops.c index c09294e39ca6..a051b6993177 100644 --- a/net/ieee802154/header_ops.c +++ b/net/ieee802154/header_ops.c | |||
@@ -14,8 +14,9 @@ | |||
14 | * Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> | 14 | * Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/ieee802154.h> | ||
18 | |||
17 | #include <net/mac802154.h> | 19 | #include <net/mac802154.h> |
18 | #include <net/ieee802154.h> | ||
19 | #include <net/ieee802154_netdev.h> | 20 | #include <net/ieee802154_netdev.h> |
20 | 21 | ||
21 | static int | 22 | static int |
diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c index a9c8e3e98387..fb6866d1dd39 100644 --- a/net/ieee802154/nl-mac.c +++ b/net/ieee802154/nl-mac.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
23 | #include <linux/if_arp.h> | 23 | #include <linux/if_arp.h> |
24 | #include <linux/netdevice.h> | 24 | #include <linux/netdevice.h> |
25 | #include <linux/ieee802154.h> | ||
25 | #include <net/netlink.h> | 26 | #include <net/netlink.h> |
26 | #include <net/genetlink.h> | 27 | #include <net/genetlink.h> |
27 | #include <net/sock.h> | 28 | #include <net/sock.h> |
@@ -29,7 +30,6 @@ | |||
29 | #include <linux/export.h> | 30 | #include <linux/export.h> |
30 | #include <net/af_ieee802154.h> | 31 | #include <net/af_ieee802154.h> |
31 | #include <net/nl802154.h> | 32 | #include <net/nl802154.h> |
32 | #include <net/ieee802154.h> | ||
33 | #include <net/ieee802154_netdev.h> | 33 | #include <net/ieee802154_netdev.h> |
34 | #include <net/cfg802154.h> | 34 | #include <net/cfg802154.h> |
35 | 35 | ||