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>

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 83a635f173671b1cb174b7d791dafb79bebe76bb..795ac116602cb2181a46d311f59c57d6e9a30fb7 100644 (file)
--- 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 571f280204b6c51709b0cbe30aeef52a79a76f41..f1770cf892ed078caaf181d773e803d0cb70b124 100644 (file)
--- 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 9ce854f43917ad723da924e7a99e3629c6a6e9bd..1460bf52049853892d328d3ccf06a8f13e1ecc54 100644 (file)
--- 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 e4b1b1f66bd2cb580e29244bab2f56d24ba71521..e6e2993b7ec6eeba4e1cc01d61c5f8fc40e69de6 100644 (file)
--- 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 0006b9ad5127251ccb605883fb350ca3fbd31754..bea7349db6ad1cbd90d66813c048c0ad3b430837 100644 (file)
--- 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/cfg802154.h b/include/net/cfg802154.h
new file mode 100644 (file)
index 0000000..5c67467
--- /dev/null
+++ b/include/net/cfg802154.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2007, 2008, 2009 Siemens AG
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * Written by:
+ * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+ */
+
+#ifndef __NET_CFG802154_H
+#define __NET_CFG802154_H
+
+#include <linux/netdevice.h>
+#include <linux/mutex.h>
+#include <linux/bug.h>
+
+/* According to the IEEE 802.15.4 stadard the upper most significant bits of
+ * the 32-bit channel bitmaps shall be used as an integer value to specify 32
+ * possible channel pages. The lower 27 bits of the channel bit map shall be
+ * used as a bit mask to specify channel numbers within a channel page.
+ */
+#define WPAN_NUM_CHANNELS      27
+#define WPAN_NUM_PAGES         32
+
+struct wpan_phy {
+       struct mutex pib_lock;
+
+       /*
+        * This is a PIB according to 802.15.4-2011.
+        * We do not provide timing-related variables, as they
+        * aren't used outside of driver
+        */
+       u8 current_channel;
+       u8 current_page;
+       u32 channels_supported[32];
+       s8 transmit_power;
+       u8 cca_mode;
+       u8 min_be;
+       u8 max_be;
+       u8 csma_retries;
+       s8 frame_retries;
+
+       bool lbt;
+       s32 cca_ed_level;
+
+       struct device dev;
+       int idx;
+
+       struct net_device *(*add_iface)(struct wpan_phy *phy,
+                                       const char *name, int type);
+       void (*del_iface)(struct wpan_phy *phy, struct net_device *dev);
+
+       int (*set_txpower)(struct wpan_phy *phy, int db);
+       int (*set_lbt)(struct wpan_phy *phy, bool on);
+       int (*set_cca_mode)(struct wpan_phy *phy, u8 cca_mode);
+       int (*set_cca_ed_level)(struct wpan_phy *phy, int level);
+       int (*set_csma_params)(struct wpan_phy *phy, u8 min_be, u8 max_be,
+                              u8 retries);
+       int (*set_frame_retries)(struct wpan_phy *phy, s8 retries);
+
+       char priv[0] __aligned(NETDEV_ALIGN);
+};
+
+#define to_phy(_dev)   container_of(_dev, struct wpan_phy, dev)
+
+struct wpan_phy *wpan_phy_alloc(size_t priv_size);
+static inline void wpan_phy_set_dev(struct wpan_phy *phy, struct device *dev)
+{
+       phy->dev.parent = dev;
+}
+
+int wpan_phy_register(struct wpan_phy *phy);
+void wpan_phy_unregister(struct wpan_phy *phy);
+void wpan_phy_free(struct wpan_phy *phy);
+/* Same semantics as for class_for_each_device */
+int wpan_phy_for_each(int (*fn)(struct wpan_phy *phy, void *data), void *data);
+
+static inline void *wpan_phy_priv(struct wpan_phy *phy)
+{
+       BUG_ON(!phy);
+       return &phy->priv;
+}
+
+struct wpan_phy *wpan_phy_find(const char *str);
+
+static inline void wpan_phy_put(struct wpan_phy *phy)
+{
+       put_device(&phy->dev);
+}
+
+static inline const char *wpan_phy_name(struct wpan_phy *phy)
+{
+       return dev_name(&phy->dev);
+}
+
+#endif /* __NET_CFG802154_H */

diff --git a/include/net/wpan-phy.h b/include/net/wpan-phy.h
deleted file mode 100644 (file)
index 1e9795f..0000000
--- a/include/net/wpan-phy.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2007, 2008, 2009 Siemens AG
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Written by:
- * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
- */
-
-#ifndef WPAN_PHY_H
-#define WPAN_PHY_H
-
-#include <linux/netdevice.h>
-#include <linux/mutex.h>
-#include <linux/bug.h>
-
-/* According to the IEEE 802.15.4 stadard the upper most significant bits of
- * the 32-bit channel bitmaps shall be used as an integer value to specify 32
- * possible channel pages. The lower 27 bits of the channel bit map shall be
- * used as a bit mask to specify channel numbers within a channel page.
- */
-#define WPAN_NUM_CHANNELS      27
-#define WPAN_NUM_PAGES         32
-
-struct wpan_phy {
-       struct mutex pib_lock;
-
-       /*
-        * This is a PIB according to 802.15.4-2011.
-        * We do not provide timing-related variables, as they
-        * aren't used outside of driver
-        */
-       u8 current_channel;
-       u8 current_page;
-       u32 channels_supported[32];
-       s8 transmit_power;
-       u8 cca_mode;
-       u8 min_be;
-       u8 max_be;
-       u8 csma_retries;
-       s8 frame_retries;
-
-       bool lbt;
-       s32 cca_ed_level;
-
-       struct device dev;
-       int idx;
-
-       struct net_device *(*add_iface)(struct wpan_phy *phy,
-                                       const char *name, int type);
-       void (*del_iface)(struct wpan_phy *phy, struct net_device *dev);
-
-       int (*set_txpower)(struct wpan_phy *phy, int db);
-       int (*set_lbt)(struct wpan_phy *phy, bool on);
-       int (*set_cca_mode)(struct wpan_phy *phy, u8 cca_mode);
-       int (*set_cca_ed_level)(struct wpan_phy *phy, int level);
-       int (*set_csma_params)(struct wpan_phy *phy, u8 min_be, u8 max_be,
-                              u8 retries);
-       int (*set_frame_retries)(struct wpan_phy *phy, s8 retries);
-
-       char priv[0] __aligned(NETDEV_ALIGN);
-};
-
-#define to_phy(_dev)   container_of(_dev, struct wpan_phy, dev)
-
-struct wpan_phy *wpan_phy_alloc(size_t priv_size);
-static inline void wpan_phy_set_dev(struct wpan_phy *phy, struct device *dev)
-{
-       phy->dev.parent = dev;
-}
-
-int wpan_phy_register(struct wpan_phy *phy);
-void wpan_phy_unregister(struct wpan_phy *phy);
-void wpan_phy_free(struct wpan_phy *phy);
-/* Same semantics as for class_for_each_device */
-int wpan_phy_for_each(int (*fn)(struct wpan_phy *phy, void *data), void *data);
-
-static inline void *wpan_phy_priv(struct wpan_phy *phy)
-{
-       BUG_ON(!phy);
-       return &phy->priv;
-}
-
-struct wpan_phy *wpan_phy_find(const char *str);
-
-static inline void wpan_phy_put(struct wpan_phy *phy)
-{
-       put_device(&phy->dev);
-}
-
-static inline const char *wpan_phy_name(struct wpan_phy *phy)
-{
-       return dev_name(&phy->dev);
-}
-#endif

diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c
index 78a1529e8bb2ca86e3c4d323b024cc833524fd29..a9c8e3e983872faa5c6c03d58ef858cdea07936a 100644 (file)
--- 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 e943e20bcf091d35503b6a68d78c87a2ca7c6ad9..0afe760ff5126d6e24530236377d6b9e19b71728 100644 (file)
--- 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 e4c6fb31a3601225342c9602010bc5f761f1a76f..760b7d752190dda1f0c8631a766240bd9df7f288 100644 (file)
--- 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 5adcbd87a4f595d46894fc6c13c04a225a79bec3..5a604074555bed1614a4542dfe8e143b413e1c7d 100644 (file)
--- 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 7c4b05ba2fe1e665e02274d3173e9a3e6c1b53c3..f118ea06d3449a0e2f8c6d150213693a4a87aaa1 100644 (file)
--- 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 d11e42ae10d6c88286f8abf34f8ba7ecab24f722..9798c741739ca589d2c2dda697e42dcac3f08ab6 100644 (file)
--- 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 91cd3b2602430b1ff8e7d6c422d94f16bd8e10d1..7c94672161992678679fdd061fc3d25b1ba7c36f 100644 (file)
--- 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 2647a9e002eaf31bde860ee8e806ad8c2ccdfdc7..ca1dedd9b2299aa6bbfa097c513d8acd1082cf0a 100644 (file)
--- 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 ef11cc6fa32333b711d79a7721662cb278c7e6d2..8f537bf731cad61928cf7006950903578618db67 100644 (file)
--- 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"