[PATCH bluetooth-next 0/7] ieee802154: file movements

[PATCH bluetooth-next 0/7] ieee802154: file movements

[Alexander Aring]

This series contains file movements patches inside the 802.15.4 subsystem.
The series contains necessary movements to get a similar architecture like
mac80211 and wireless subsystem.

Alexander Aring (7):
  mac802154: move ieee802154_dev.c to main.c
  mac802154: move mac802154.h to ieee802154_i.h
  mac802154: move wpan.c to iface.c
  ieee802154: move wpan-phy.h to cfg802154.h
  ieee802154: move wpan-class.c to core.c
  ieee802154: move ieee802154 header
  MAINTAINERS: add missing headers in 802.15.4

 MAINTAINERS                                   | 7 +++++++
 drivers/net/ieee802154/at86rf230.c            | 4 ++--
 drivers/net/ieee802154/cc2520.c               | 4 ++--
 drivers/net/ieee802154/fakehard.c             | 4 ++--
 drivers/net/ieee802154/fakelb.c               | 2 +-
 drivers/net/ieee802154/mrf24j40.c             | 4 ++--
 include/{net => linux}/ieee802154.h           | 0
 include/net/{wpan-phy.h => cfg802154.h}       | 7 ++++---
 include/net/ieee802154_netdev.h               | 2 +-
 net/ieee802154/6lowpan_rtnl.c                 | 2 +-
 net/ieee802154/Makefile                       | 2 +-
 net/ieee802154/{wpan-class.c => core.c}       | 2 +-
 net/ieee802154/dgram.c                        | 2 +-
 net/ieee802154/header_ops.c                   | 3 ++-
 net/ieee802154/nl-mac.c                       | 4 ++--
 net/ieee802154/nl-phy.c                       | 2 +-
 net/mac802154/Makefile                        | 4 ++--
 net/mac802154/{mac802154.h => ieee802154_i.h} | 6 +++---
 net/mac802154/{wpan.c => iface.c}             | 6 +++---
 net/mac802154/llsec.c                         | 4 ++--
 net/mac802154/mac_cmd.c                       | 6 +++---
 net/mac802154/{ieee802154_dev.c => main.c}    | 4 ++--
 net/mac802154/mib.c                           | 4 ++--
 net/mac802154/monitor.c                       | 6 +++---
 net/mac802154/rx.c                            | 2 +-
 net/mac802154/tx.c                            | 4 ++--
 26 files changed, 53 insertions(+), 44 deletions(-)
 rename include/{net => linux}/ieee802154.h (100%)
 rename include/net/{wpan-phy.h => cfg802154.h} (97%)
 rename net/ieee802154/{wpan-class.c => core.c} (99%)
 rename net/mac802154/{mac802154.h => ieee802154_i.h} (98%)
 rename net/mac802154/{wpan.c => iface.c} (99%)
 rename net/mac802154/{ieee802154_dev.c => main.c} (99%)

-- 
2.1.2

[PATCH bluetooth-next 1/7] mac802154: move ieee802154_dev.c to main.c

[Alexander Aring]

The ieee802154_dev functionality contains various function for
allocation and registration of an ieee802154_dev. This is equal to the
net/mac80211/main.c file. This patch rename the ieee802154_dev.c to
main.c to have the same behaviour.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 net/mac802154/Makefile                     | 2 +-
 net/mac802154/{ieee802154_dev.c => main.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename net/mac802154/{ieee802154_dev.c => main.c} (100%)

diff --git a/net/mac802154/Makefile b/net/mac802154/Makefile
index 9723d6f..1ecbc47 100644
--- a/net/mac802154/Makefile
+++ b/net/mac802154/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_MAC802154)	+= mac802154.o
-mac802154-objs		:= ieee802154_dev.o rx.o tx.o mac_cmd.o mib.o \
+mac802154-objs		:= main.o rx.o tx.o mac_cmd.o mib.o \
 			   monitor.o wpan.o llsec.o
 
 ccflags-y += -D__CHECK_ENDIAN__
diff --git a/net/mac802154/ieee802154_dev.c b/net/mac802154/main.c
similarity index 100%
rename from net/mac802154/ieee802154_dev.c
rename to net/mac802154/main.c
-- 
2.1.2

[PATCH bluetooth-next 2/7] mac802154: move mac802154.h to ieee802154_i.h

[Alexander Aring]

This patch moves the mac802154.h internal header to ieee802154_i.h like
the wireless stack ieee80211_i.h file. This avoids confusing with the
not internal header include/net/mac802154.h header. Additional we get
the same naming conversion like mac80211 for this file.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 net/mac802154/{mac802154.h => ieee802154_i.h} | 6 +++---
 net/mac802154/llsec.c                         | 2 +-
 net/mac802154/mac_cmd.c                       | 2 +-
 net/mac802154/main.c                          | 2 +-
 net/mac802154/mib.c                           | 2 +-
 net/mac802154/monitor.c                       | 2 +-
 net/mac802154/rx.c                            | 2 +-
 net/mac802154/tx.c                            | 2 +-
 net/mac802154/wpan.c                          | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename net/mac802154/{mac802154.h => ieee802154_i.h} (98%)

diff --git a/net/mac802154/mac802154.h b/net/mac802154/ieee802154_i.h
similarity index 98%
rename from net/mac802154/mac802154.h
rename to net/mac802154/ieee802154_i.h
index e3503c1..970b621 100644
--- a/net/mac802154/mac802154.h
+++ b/net/mac802154/ieee802154_i.h
@@ -16,8 +16,8 @@
  * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
  */
-#ifndef MAC802154_H
-#define MAC802154_H
+#ifndef __IEEE802154_I_H
+#define __IEEE802154_I_H
 
 #include <linux/mutex.h>
 #include <net/mac802154.h>
@@ -165,4 +165,4 @@ void mac802154_get_table(struct net_device *dev,
 			 struct ieee802154_llsec_table **t);
 void mac802154_unlock_table(struct net_device *dev);
 
-#endif /* MAC802154_H */
+#endif /* __IEEE802154_I_H */
diff --git a/net/mac802154/llsec.c b/net/mac802154/llsec.c
index 4570581..26f8761 100644
--- a/net/mac802154/llsec.c
+++ b/net/mac802154/llsec.c
@@ -20,7 +20,7 @@
 #include <net/ieee802154.h>
 #include <crypto/algapi.h>
 
-#include "mac802154.h"
+#include "ieee802154_i.h"
 #include "llsec.h"
 
 static void llsec_key_put(struct mac802154_llsec_key *key);
diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c
index 85f70ed..7c4b05b 100644
--- a/net/mac802154/mac_cmd.c
+++ b/net/mac802154/mac_cmd.c
@@ -27,7 +27,7 @@
 #include <net/mac802154.h>
 #include <net/nl802154.h>
 
-#include "mac802154.h"
+#include "ieee802154_i.h"
 
 static int mac802154_mlme_start_req(struct net_device *dev,
 				    struct ieee802154_addr *addr,
diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index 086d4a9..d11e42a 100644
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -27,7 +27,7 @@
 #include <net/route.h>
 #include <net/wpan-phy.h>
 
-#include "mac802154.h"
+#include "ieee802154_i.h"
 
 int mac802154_slave_open(struct net_device *dev)
 {
diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index 3ee6042..91cd3b2 100644
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -23,7 +23,7 @@
 #include <net/ieee802154_netdev.h>
 #include <net/wpan-phy.h>
 
-#include "mac802154.h"
+#include "ieee802154_i.h"
 
 struct phy_chan_notify_work {
 	struct work_struct work;
diff --git a/net/mac802154/monitor.c b/net/mac802154/monitor.c
index 81249bb..2647a9e 100644
--- a/net/mac802154/monitor.c
+++ b/net/mac802154/monitor.c
@@ -28,7 +28,7 @@
 #include <net/wpan-phy.h>
 #include <linux/nl802154.h>
 
-#include "mac802154.h"
+#include "ieee802154_i.h"
 
 static netdev_tx_t mac802154_monitor_xmit(struct sk_buff *skb,
 					  struct net_device *dev)
diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c
index e99d939..bc6cffd5 100644
--- a/net/mac802154/rx.c
+++ b/net/mac802154/rx.c
@@ -26,7 +26,7 @@
 #include <net/mac802154.h>
 #include <net/ieee802154_netdev.h>
 
-#include "mac802154.h"
+#include "ieee802154_i.h"
 
 /* The IEEE 802.15.4 standard defines 4 MAC packet types:
  * - beacon frame
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 95ea412..ef11cc6 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -25,7 +25,7 @@
 #include <net/mac802154.h>
 #include <net/wpan-phy.h>
 
-#include "mac802154.h"
+#include "ieee802154_i.h"
 
 /* IEEE 802.15.4 transceivers can sleep during the xmit session, so process
  * packets through the workqueue.
diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
index b11a98d..5adcbd8 100644
--- a/net/mac802154/wpan.c
+++ b/net/mac802154/wpan.c
@@ -29,7 +29,7 @@
 #include <net/ieee802154.h>
 #include <net/wpan-phy.h>
 
-#include "mac802154.h"
+#include "ieee802154_i.h"
 
 static int mac802154_wpan_update_llsec(struct net_device *dev)
 {
-- 
2.1.2

[PATCH bluetooth-next 3/7] mac802154: move wpan.c to iface.c

[Alexander Aring]

The wpan.c file contains the interface handling functions now. It's similar
like the mac80211 iface.c file. This patch renames this file to iface.c to
have similar naming convention in mac802154.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 net/mac802154/Makefile            | 2 +-
 net/mac802154/{wpan.c => iface.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename net/mac802154/{wpan.c => iface.c} (100%)

diff --git a/net/mac802154/Makefile b/net/mac802154/Makefile
index 1ecbc47..203f42d 100644
--- a/net/mac802154/Makefile
+++ b/net/mac802154/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_MAC802154)	+= mac802154.o
 mac802154-objs		:= main.o rx.o tx.o mac_cmd.o mib.o \
-			   monitor.o wpan.o llsec.o
+			   monitor.o iface.o llsec.o
 
 ccflags-y += -D__CHECK_ENDIAN__
diff --git a/net/mac802154/wpan.c b/net/mac802154/iface.c
similarity index 100%
rename from net/mac802154/wpan.c
rename to net/mac802154/iface.c
-- 
2.1.2

[PATCH bluetooth-next 4/7] ieee802154: move wpan-phy.h to cfg802154.h

[Alexander Aring]

The wpan-phy header contains the wpan_phy struct information. Later this
header will be have similar function like cfg80211 header. The cfg80211
header contains the wiphy struct which is identically the wpan_phy
struct inside 802.15.4 subsystem.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Cc: Alan Ott <alan@signal11.us>
---
 drivers/net/ieee802154/at86rf230.c      | 2 +-
 drivers/net/ieee802154/cc2520.c         | 2 +-
 drivers/net/ieee802154/fakehard.c       | 2 +-
 drivers/net/ieee802154/fakelb.c         | 2 +-
 drivers/net/ieee802154/mrf24j40.c       | 2 +-
 include/net/{wpan-phy.h => cfg802154.h} | 7 ++++---
 net/ieee802154/nl-mac.c                 | 2 +-
 net/ieee802154/nl-phy.c                 | 2 +-
 net/ieee802154/wpan-class.c             | 2 +-
 net/mac802154/iface.c                   | 2 +-
 net/mac802154/mac_cmd.c                 | 2 +-
 net/mac802154/main.c                    | 2 +-
 net/mac802154/mib.c                     | 2 +-
 net/mac802154/monitor.c                 | 2 +-
 net/mac802154/tx.c                      | 2 +-
 15 files changed, 18 insertions(+), 17 deletions(-)
 rename include/net/{wpan-phy.h => cfg802154.h} (97%)

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 83a635f..795ac11 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -32,7 +32,7 @@
 
 #include <net/ieee802154.h>
 #include <net/mac802154.h>
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 
 struct at86rf230_local;
 /* at86rf2xx chip depend data.
diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c
index 571f280..f1770cf 100644
--- a/drivers/net/ieee802154/cc2520.c
+++ b/drivers/net/ieee802154/cc2520.c
@@ -23,7 +23,7 @@
 #include <linux/of_gpio.h>
 
 #include <net/mac802154.h>
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 #include <net/ieee802154.h>
 
 #define	SPI_COMMAND_BUFFER	3
diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
index 9ce854f..1460bf5 100644
--- a/drivers/net/ieee802154/fakehard.c
+++ b/drivers/net/ieee802154/fakehard.c
@@ -30,7 +30,7 @@
 #include <net/ieee802154_netdev.h>
 #include <net/ieee802154.h>
 #include <net/nl802154.h>
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 
 struct fakehard_priv {
 	struct wpan_phy *phy;
diff --git a/drivers/net/ieee802154/fakelb.c b/drivers/net/ieee802154/fakelb.c
index e4b1b1f..e6e2993 100644
--- a/drivers/net/ieee802154/fakelb.c
+++ b/drivers/net/ieee802154/fakelb.c
@@ -25,7 +25,7 @@
 #include <linux/device.h>
 #include <linux/spinlock.h>
 #include <net/mac802154.h>
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 
 static int numlbs = 1;
 
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 0006b9a..bea7349 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -18,7 +18,7 @@
 #include <linux/spi/spi.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 #include <net/mac802154.h>
 #include <net/ieee802154.h>
 
diff --git a/include/net/wpan-phy.h b/include/net/cfg802154.h
similarity index 97%
rename from include/net/wpan-phy.h
rename to include/net/cfg802154.h
index 1e9795f..5c67467 100644
--- a/include/net/wpan-phy.h
+++ b/include/net/cfg802154.h
@@ -14,8 +14,8 @@
  * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  */
 
-#ifndef WPAN_PHY_H
-#define WPAN_PHY_H
+#ifndef __NET_CFG802154_H
+#define __NET_CFG802154_H
 
 #include <linux/netdevice.h>
 #include <linux/mutex.h>
@@ -99,4 +99,5 @@ static inline const char *wpan_phy_name(struct wpan_phy *phy)
 {
 	return dev_name(&phy->dev);
 }
-#endif
+
+#endif /* __NET_CFG802154_H */
diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c
index 78a1529..a9c8e3e 100644
--- a/net/ieee802154/nl-mac.c
+++ b/net/ieee802154/nl-mac.c
@@ -31,7 +31,7 @@
 #include <net/nl802154.h>
 #include <net/ieee802154.h>
 #include <net/ieee802154_netdev.h>
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 
 #include "ieee802154.h"
 
diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c
index e943e20..0afe760 100644
--- a/net/ieee802154/nl-phy.c
+++ b/net/ieee802154/nl-phy.c
@@ -23,7 +23,7 @@
 #include <linux/if_arp.h>
 #include <net/netlink.h>
 #include <net/genetlink.h>
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 #include <net/af_ieee802154.h>
 #include <net/ieee802154_netdev.h>
 #include <net/rtnetlink.h> /* for rtnl_{un,}lock */
diff --git a/net/ieee802154/wpan-class.c b/net/ieee802154/wpan-class.c
index e4c6fb3..760b7d7 100644
--- a/net/ieee802154/wpan-class.c
+++ b/net/ieee802154/wpan-class.c
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/device.h>
 
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 
 #include "ieee802154.h"
 
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index 5adcbd8..5a60407 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -27,7 +27,7 @@
 #include <net/mac802154.h>
 #include <net/ieee802154_netdev.h>
 #include <net/ieee802154.h>
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 
 #include "ieee802154_i.h"
 
diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c
index 7c4b05b..f118ea0 100644
--- a/net/mac802154/mac_cmd.c
+++ b/net/mac802154/mac_cmd.c
@@ -23,7 +23,7 @@
 
 #include <net/ieee802154.h>
 #include <net/ieee802154_netdev.h>
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 #include <net/mac802154.h>
 #include <net/nl802154.h>
 
diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index d11e42a..9798c74 100644
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -25,7 +25,7 @@
 #include <net/mac802154.h>
 #include <net/ieee802154_netdev.h>
 #include <net/route.h>
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 
 #include "ieee802154_i.h"
 
diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index 91cd3b2..7c94672 100644
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -21,7 +21,7 @@
 
 #include <net/mac802154.h>
 #include <net/ieee802154_netdev.h>
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 
 #include "ieee802154_i.h"
 
diff --git a/net/mac802154/monitor.c b/net/mac802154/monitor.c
index 2647a9e..ca1dedd 100644
--- a/net/mac802154/monitor.c
+++ b/net/mac802154/monitor.c
@@ -25,7 +25,7 @@
 #include <net/ieee802154.h>
 #include <net/mac802154.h>
 #include <net/netlink.h>
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 #include <linux/nl802154.h>
 
 #include "ieee802154_i.h"
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index ef11cc6..8f537bf 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -23,7 +23,7 @@
 
 #include <net/ieee802154_netdev.h>
 #include <net/mac802154.h>
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 
 #include "ieee802154_i.h"
 
-- 
2.1.2

[PATCH bluetooth-next 5/7] ieee802154: move wpan-class.c to core.c

[Alexander Aring]

Like the wireless core.c file this file contains function for phy
allocation and freeing. Move this file to core.c to get similar
behaviour.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 net/ieee802154/Makefile                 | 2 +-
 net/ieee802154/{wpan-class.c => core.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename net/ieee802154/{wpan-class.c => core.c} (100%)

diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile
index 3914b1e..e58c4cb 100644
--- a/net/ieee802154/Makefile
+++ b/net/ieee802154/Makefile
@@ -2,7 +2,7 @@ obj-$(CONFIG_IEEE802154) += ieee802154.o af_802154.o
 obj-$(CONFIG_IEEE802154_6LOWPAN) += ieee802154_6lowpan.o
 
 ieee802154_6lowpan-y := 6lowpan_rtnl.o reassembly.o
-ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o wpan-class.o \
+ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o core.o \
                 header_ops.o
 af_802154-y := af_ieee802154.o raw.o dgram.o
 
diff --git a/net/ieee802154/wpan-class.c b/net/ieee802154/core.c
similarity index 100%
rename from net/ieee802154/wpan-class.c
rename to net/ieee802154/core.c
-- 
2.1.2

[PATCH bluetooth-next 6/7] ieee802154: move ieee802154 header

[Alexander Aring]

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>
---
 drivers/net/ieee802154/at86rf230.c  | 2 +-
 drivers/net/ieee802154/cc2520.c     | 2 +-
 drivers/net/ieee802154/fakehard.c   | 2 +-
 drivers/net/ieee802154/mrf24j40.c   | 2 +-
 include/{net => linux}/ieee802154.h | 0
 include/net/ieee802154_netdev.h     | 2 +-
 net/ieee802154/6lowpan_rtnl.c       | 2 +-
 net/ieee802154/dgram.c              | 2 +-
 net/ieee802154/header_ops.c         | 3 ++-
 net/ieee802154/nl-mac.c             | 2 +-
 net/mac802154/iface.c               | 2 +-
 net/mac802154/llsec.c               | 2 +-
 net/mac802154/mac_cmd.c             | 2 +-
 net/mac802154/monitor.c             | 2 +-
 14 files changed, 14 insertions(+), 13 deletions(-)
 rename include/{net => linux}/ieee802154.h (100%)

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 795ac11..a433d20 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -29,8 +29,8 @@
 #include <linux/regmap.h>
 #include <linux/skbuff.h>
 #include <linux/of_gpio.h>
+#include <linux/ieee802154.h>
 
-#include <net/ieee802154.h>
 #include <net/mac802154.h>
 #include <net/cfg802154.h>
 
diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c
index f1770cf..32b3c88 100644
--- a/drivers/net/ieee802154/cc2520.c
+++ b/drivers/net/ieee802154/cc2520.c
@@ -21,10 +21,10 @@
 #include <linux/skbuff.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/of_gpio.h>
+#include <linux/ieee802154.h>
 
 #include <net/mac802154.h>
 #include <net/cfg802154.h>
-#include <net/ieee802154.h>
 
 #define	SPI_COMMAND_BUFFER	3
 #define	HIGH			1
diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
index 1460bf5..8be05ad 100644
--- a/drivers/net/ieee802154/fakehard.c
+++ b/drivers/net/ieee802154/fakehard.c
@@ -25,10 +25,10 @@
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
+#include <linux/ieee802154.h>
 
 #include <net/af_ieee802154.h>
 #include <net/ieee802154_netdev.h>
-#include <net/ieee802154.h>
 #include <net/nl802154.h>
 #include <net/cfg802154.h>
 
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index bea7349..56a6959 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -18,9 +18,9 @@
 #include <linux/spi/spi.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/ieee802154.h>
 #include <net/cfg802154.h>
 #include <net/mac802154.h>
-#include <net/ieee802154.h>
 
 /* MRF24J40 Short Address Registers */
 #define REG_RXMCR    0x00  /* Receive MAC control */
diff --git a/include/net/ieee802154.h b/include/linux/ieee802154.h
similarity index 100%
rename from include/net/ieee802154.h
rename to include/linux/ieee802154.h
diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
index f874206..5e62d75 100644
--- a/include/net/ieee802154_netdev.h
+++ b/include/net/ieee802154_netdev.h
@@ -23,10 +23,10 @@
 #ifndef IEEE802154_NETDEVICE_H
 #define IEEE802154_NETDEVICE_H
 
-#include <net/ieee802154.h>
 #include <net/af_ieee802154.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <linux/ieee802154.h>
 
 struct ieee802154_sechdr {
 #if defined(__LITTLE_ENDIAN_BITFIELD)
diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
index 0c1a49b..1779a08 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 71e99a0..3d58bef 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 c09294e..a051b69 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 a9c8e3e..fb6866d 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 5a60407..03eedc3 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 26f8761..fa0d523 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 f118ea0..ad09d54 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 ca1dedd..ca82c72 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>
-- 
2.1.2

[PATCH bluetooth-next 7/7] MAINTAINERS: add missing headers in 802.15.4

[Alexander Aring]

This patch adds a lot of include headers which are missing by the
current IEEE 802.15.4 subsystem.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 MAINTAINERS | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 43898b1..15867a6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4689,6 +4689,13 @@ S:	Maintained
 F:	net/ieee802154/
 F:	net/mac802154/
 F:	drivers/net/ieee802154/
+F:	include/linux/nl802154.h
+F:	include/linux/ieee802154.h
+F:	include/net/nl802154.h
+F:	include/net/mac802154.h
+F:	include/net/af_ieee802154.h
+F:	include/net/cfg802154.h
+F:	include/net/ieee802154_netdev.h
 F:	Documentation/networking/ieee802154.txt
 
 IGUANAWORKS USB IR TRANSCEIVER
-- 
2.1.2

Re: [PATCH bluetooth-next 0/7] ieee802154: file movements

[Alexander Aring]

On Sat, Oct 25, 2014 at 09:24:58AM +0200, Alexander Aring wrote:
> This series contains file movements patches inside the 802.15.4 subsystem.
> The series contains necessary movements to get a similar architecture like
> mac80211 and wireless subsystem.
> 

Marcel, please drop this series. I forget one little point here.

Will send a v2.

- Alex