summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-10-25 09:41:04 +0200
committerMarcel Holtmann <marcel@holtmann.org>2014-10-25 21:39:57 +0200
commit4ca24aca55fe1e2a61f3ffaac9015d9c45204729 (patch)
treee3b263954c1a572bd683763cab9bc37688bcc2c6 /net
parent86d52cd96414f05c4053fb264a85309772c6ae26 (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')
-rw-r--r--net/ieee802154/6lowpan_rtnl.c2
-rw-r--r--net/ieee802154/dgram.c2
-rw-r--r--net/ieee802154/header_ops.c3
-rw-r--r--net/ieee802154/nl-mac.c2
-rw-r--r--net/mac802154/iface.c2
-rw-r--r--net/mac802154/llsec.c2
-rw-r--r--net/mac802154/mac_cmd.c2
-rw-r--r--net/mac802154/monitor.c2
8 files changed, 9 insertions, 8 deletions
diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
index 0c1a49b51e5..1779a08d110 100644
--- a/net/ieee802154/6lowpan_rtnl.c
+++ b/net/ieee802154/6lowpan_rtnl.c
@@ -49,8 +49,8 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/netdevice.h>
+#include <linux/ieee802154.h>
#include <net/af_ieee802154.h>
-#include <net/ieee802154.h>
#include <net/ieee802154_netdev.h>
#include <net/6lowpan.h>
#include <net/ipv6.h>
diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c
index 71e99a0994e..3d58befef46 100644
--- a/net/ieee802154/dgram.c
+++ b/net/ieee802154/dgram.c
@@ -23,9 +23,9 @@
#include <linux/if_arp.h>
#include <linux/list.h>
#include <linux/slab.h>
+#include <linux/ieee802154.h>
#include <net/sock.h>
#include <net/af_ieee802154.h>
-#include <net/ieee802154.h>
#include <net/ieee802154_netdev.h>
#include <asm/ioctls.h>
diff --git a/net/ieee802154/header_ops.c b/net/ieee802154/header_ops.c
index c09294e39ca..a051b699317 100644
--- a/net/ieee802154/header_ops.c
+++ b/net/ieee802154/header_ops.c
@@ -14,8 +14,9 @@
* Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>
*/
+#include <linux/ieee802154.h>
+
#include <net/mac802154.h>
-#include <net/ieee802154.h>
#include <net/ieee802154_netdev.h>
static int
diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c
index a9c8e3e9838..fb6866d1dd3 100644
--- a/net/ieee802154/nl-mac.c
+++ b/net/ieee802154/nl-mac.c
@@ -22,6 +22,7 @@
#include <linux/kernel.h>
#include <linux/if_arp.h>
#include <linux/netdevice.h>
+#include <linux/ieee802154.h>
#include <net/netlink.h>
#include <net/genetlink.h>
#include <net/sock.h>
@@ -29,7 +30,6 @@
#include <linux/export.h>
#include <net/af_ieee802154.h>
#include <net/nl802154.h>
-#include <net/ieee802154.h>
#include <net/ieee802154_netdev.h>
#include <net/cfg802154.h>
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index 5a604074555..03eedc3b23e 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -20,13 +20,13 @@
#include <linux/netdevice.h>
#include <linux/module.h>
#include <linux/if_arp.h>
+#include <linux/ieee802154.h>
#include <net/rtnetlink.h>
#include <linux/nl802154.h>
#include <net/af_ieee802154.h>
#include <net/mac802154.h>
#include <net/ieee802154_netdev.h>
-#include <net/ieee802154.h>
#include <net/cfg802154.h>
#include "ieee802154_i.h"
diff --git a/net/mac802154/llsec.c b/net/mac802154/llsec.c
index 26f876128ae..fa0d5237c2e 100644
--- a/net/mac802154/llsec.c
+++ b/net/mac802154/llsec.c
@@ -17,7 +17,7 @@
#include <linux/err.h>
#include <linux/bug.h>
#include <linux/completion.h>
-#include <net/ieee802154.h>
+#include <linux/ieee802154.h>
#include <crypto/algapi.h>
#include "ieee802154_i.h"
diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c
index f118ea06d34..ad09d54bc69 100644
--- a/net/mac802154/mac_cmd.c
+++ b/net/mac802154/mac_cmd.c
@@ -20,8 +20,8 @@
#include <linux/skbuff.h>
#include <linux/if_arp.h>
+#include <linux/ieee802154.h>
-#include <net/ieee802154.h>
#include <net/ieee802154_netdev.h>
#include <net/cfg802154.h>
#include <net/mac802154.h>
diff --git a/net/mac802154/monitor.c b/net/mac802154/monitor.c
index ca1dedd9b22..ca82c72a635 100644
--- a/net/mac802154/monitor.c
+++ b/net/mac802154/monitor.c
@@ -21,8 +21,8 @@
#include <linux/skbuff.h>
#include <linux/if_arp.h>
#include <linux/crc-ccitt.h>
+#include <linux/ieee802154.h>
-#include <net/ieee802154.h>
#include <net/mac802154.h>
#include <net/netlink.h>
#include <net/cfg802154.h>