From 5ad60d36993596f7b3b958500f9c66c5338cd855 Mon Sep 17 00:00:00 2001
From: Alexander Aring <alex.aring@gmail.com>
Date: Sat, 25 Oct 2014 09:41:02 +0200
Subject: [PATCH] ieee802154: move wpan-phy.h to cfg802154.h

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>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
 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 83a635f17367..795ac116602c 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 571f280204b6..f1770cf892ed 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 9ce854f43917..1460bf520498 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 e4b1b1f66bd2..e6e2993b7ec6 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 0006b9ad5127..bea7349db6ad 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 1e9795f116ba..5c674673ef20 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 78a1529e8bb2..a9c8e3e98387 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 e943e20bcf09..0afe760ff512 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 e4c6fb31a360..760b7d752190 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 5adcbd87a4f5..5a604074555b 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 7c4b05ba2fe1..f118ea06d344 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 d11e42ae10d6..9798c741739c 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 91cd3b260243..7c9467216199 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 2647a9e002ea..ca1dedd9b229 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 ef11cc6fa323..8f537bf731ca 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"