Skip to contentSkip to conversation

ieee802154: file movements

PATCH In review Alexander Aring 2 participants 9 messages Oct 25, 2014

Subsystems (5)
lore
Share & tools
lore

Alexander Aring

author maintainer
#0 lore raw

v2 cover ieee802154: file movements

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.

changes since v2:
- rename mutal inclusion define while moving ieee802154 header to include/linux/. From NET_IEEE802154_H to LINUX_IEEE802154_H.

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           | 8 +++-----
 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, 56 insertions(+), 49 deletions(-)
 rename include/{net => linux}/ieee802154.h (98%)
 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%)
Signature · 1 line
2.1.2
author maintainer
#1 lore raw

PATCH v2 1/7 mac802154: move ieee802154_dev.c to main.c

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.

---
 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%)
net/mac802154/Makefile +1 -1
index 9723d6f..1ecbc47 100644
@@ -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__
net/mac802154/main.c renamed from net/mac802154/ieee802154_dev.c +0 -0
similarity index 100%
rename from net/mac802154/ieee802154_dev.c
rename to net/mac802154/main.c
Signature · 1 line
2.1.2
author maintainer
#2 lore raw

PATCH v2 2/7 mac802154: move mac802154.h to ieee802154_i.h

In reply to 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.

---
 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%)
net/mac802154/ieee802154_i.h renamed from net/mac802154/mac802154.h +3 -3
similarity index 98%
rename from net/mac802154/mac802154.h
rename to net/mac802154/ieee802154_i.h
index e3503c1..970b621 100644
@@ -16,8 +16,8 @@
  * Dmitry Eremin-Solenikov <[email protected]>
  * Alexander Smirnov <[email protected]>
  */
-#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 */
net/mac802154/llsec.c +1 -1
index 4570581..26f8761 100644
@@ -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);
net/mac802154/mac_cmd.c +1 -1
index 85f70ed..7c4b05b 100644
@@ -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,
net/mac802154/main.c +1 -1
index 086d4a9..d11e42a 100644
@@ -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)
 {
net/mac802154/mib.c +1 -1
index 3ee6042..91cd3b2 100644
@@ -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;
net/mac802154/monitor.c +1 -1
index 81249bb..2647a9e 100644
@@ -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)
net/mac802154/rx.c +1 -1
index e99d939..bc6cffd5 100644
@@ -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
net/mac802154/tx.c +1 -1
index 95ea412..ef11cc6 100644
@@ -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.
net/mac802154/wpan.c +1 -1
index b11a98d..5adcbd8 100644
@@ -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)
 {
Signature · 1 line
2.1.2
author maintainer
#3 lore raw

PATCH v2 3/7 mac802154: move wpan.c to iface.c

In reply to 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.

---
 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%)
net/mac802154/Makefile +1 -1
index 1ecbc47..203f42d 100644
@@ -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__
net/mac802154/iface.c renamed from net/mac802154/wpan.c +0 -0
similarity index 100%
rename from net/mac802154/wpan.c
rename to net/mac802154/iface.c
Signature · 1 line
2.1.2
author maintainer
#4 lore raw

PATCH v2 4/7 ieee802154: move wpan-phy.h to cfg802154.h

In reply to 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.

---
 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%)
drivers/net/ieee802154/at86rf230.c +1 -1
index 83a635f..795ac11 100644
@@ -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.
drivers/net/ieee802154/cc2520.c +1 -1
index 571f280..f1770cf 100644
@@ -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
drivers/net/ieee802154/fakehard.c +1 -1
index 9ce854f..1460bf5 100644
@@ -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;
drivers/net/ieee802154/fakelb.c +1 -1
index e4b1b1f..e6e2993 100644
@@ -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;
 
drivers/net/ieee802154/mrf24j40.c +1 -1
index 0006b9a..bea7349 100644
@@ -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>
 
include/net/cfg802154.h renamed from include/net/wpan-phy.h +4 -3
similarity index 97%
rename from include/net/wpan-phy.h
rename to include/net/cfg802154.h
index 1e9795f..5c67467 100644
@@ -14,8 +14,8 @@
  * Dmitry Eremin-Solenikov <[email protected]>
  */
 
-#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 */
net/ieee802154/nl-mac.c +1 -1
index 78a1529..a9c8e3e 100644
@@ -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"
 
net/ieee802154/nl-phy.c +1 -1
index e943e20..0afe760 100644
@@ -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 */
net/ieee802154/wpan-class.c +1 -1
index e4c6fb3..760b7d7 100644
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/device.h>
 
-#include <net/wpan-phy.h>
+#include <net/cfg802154.h>
 
 #include "ieee802154.h"
 
net/mac802154/iface.c +1 -1
index 5adcbd8..5a60407 100644
@@ -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"
 
net/mac802154/mac_cmd.c +1 -1
index 7c4b05b..f118ea0 100644
@@ -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>
 
net/mac802154/main.c +1 -1
index d11e42a..9798c74 100644
@@ -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"
 
net/mac802154/mib.c +1 -1
index 91cd3b2..7c94672 100644
@@ -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"
 
net/mac802154/monitor.c +1 -1
index 2647a9e..ca1dedd 100644
@@ -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"
net/mac802154/tx.c +1 -1
index ef11cc6..8f537bf 100644
@@ -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"
 
Signature · 1 line
2.1.2
author maintainer
#5 lore raw

PATCH v2 5/7 ieee802154: move wpan-class.c to core.c

In reply to 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.

---
 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%)
net/ieee802154/Makefile +1 -1
index 3914b1e..e58c4cb 100644
@@ -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
 
net/ieee802154/core.c renamed from net/ieee802154/wpan-class.c +0 -0
similarity index 100%
rename from net/ieee802154/wpan-class.c
rename to net/ieee802154/core.c
Signature · 1 line
2.1.2
author maintainer
#6 lore raw

PATCH v2 6/7 ieee802154: move ieee802154 header

In reply to 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.

---
 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 | 8 +++-----
 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, 17 insertions(+), 18 deletions(-)
 rename include/{net => linux}/ieee802154.h (98%)
drivers/net/ieee802154/at86rf230.c +1 -1
index 795ac11..a433d20 100644
@@ -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>
 
drivers/net/ieee802154/cc2520.c +1 -1
index f1770cf..32b3c88 100644
@@ -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
drivers/net/ieee802154/fakehard.c +1 -1
index 1460bf5..8be05ad 100644
@@ -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>
 
drivers/net/ieee802154/mrf24j40.c +1 -1
index bea7349..56a6959 100644
@@ -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 */
include/linux/ieee802154.h renamed from include/net/ieee802154.h +3 -5
similarity index 98%
rename from include/net/ieee802154.h
rename to include/linux/ieee802154.h
index 4db4e32..2dfab2d 100644
@@ -20,8 +20,8 @@
  * Alexander Smirnov <[email protected]>
  */
 
-#ifndef NET_IEEE802154_H
-#define NET_IEEE802154_H
+#ifndef LINUX_IEEE802154_H
+#define LINUX_IEEE802154_H
 
 #define IEEE802154_MTU			127
 
@@ -186,6 +186,4 @@ enum {
 };
 
 
-#endif
-
-
+#endif /* LINUX_IEEE802154_H */
include/net/ieee802154_netdev.h +1 -1
index f874206..5e62d75 100644
@@ -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)
net/ieee802154/6lowpan_rtnl.c +1 -1
index 0c1a49b..1779a08 100644
@@ -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>
net/ieee802154/dgram.c +1 -1
index 71e99a0..3d58bef 100644
@@ -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>
net/ieee802154/header_ops.c +2 -1
index c09294e..a051b69 100644
@@ -14,8 +14,9 @@
  * Phoebe Buckheister <[email protected]>
  */
 
+#include <linux/ieee802154.h>
+
 #include <net/mac802154.h>
-#include <net/ieee802154.h>
 #include <net/ieee802154_netdev.h>
 
 static int
net/ieee802154/nl-mac.c +1 -1
index a9c8e3e..fb6866d 100644
@@ -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>
 
net/mac802154/iface.c +1 -1
index 5a60407..03eedc3 100644
@@ -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"
net/mac802154/llsec.c +1 -1
index 26f8761..fa0d523 100644
@@ -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"
net/mac802154/mac_cmd.c +1 -1
index f118ea0..ad09d54 100644
@@ -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>
net/mac802154/monitor.c +1 -1
index ca1dedd..ca82c72 100644
@@ -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>
Signature · 1 line
2.1.2
author maintainer
#7 lore raw

PATCH v2 7/7 MAINTAINERS: add missing headers in 802.15.4

In reply to Alexander Aring

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

---
 MAINTAINERS | 7 +++++++
 1 file changed, 7 insertions(+)
MAINTAINERS +7 -0
index 43898b1..15867a6 100644
@@ -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
Signature · 1 line
2.1.2
#8 lore raw
In reply to Alexander Aring

Hi Alex,

Quoted 44 lines

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.

changes since v2:
- rename mutal inclusion define while moving ieee802154 header to include/linux/. From NET_IEEE802154_H to LINUX_IEEE802154_H.

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           | 8 +++-----
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, 56 insertions(+), 49 deletions(-)
Quoted 6 lines

rename include/{net => linux}/ieee802154.h (98%) 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%)

all 7 patches have been applied to bluetooth-next tree.

Regards

Marcel