aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-10-25 03:41:02 -0400
committerMarcel Holtmann <marcel@holtmann.org>2014-10-25 15:39:56 -0400
commit5ad60d36993596f7b3b958500f9c66c5338cd855 (patch)
treeb3fda3bd1d612534ee189592c247cca700d90e23
parent15859a5e141c4914c7c4d9dc9b2d54fa948fbd42 (diff)
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>
Diffstat
-rw-r--r--drivers/net/ieee802154/at86rf230.c2
-rw-r--r--drivers/net/ieee802154/cc2520.c2
-rw-r--r--drivers/net/ieee802154/fakehard.c2
-rw-r--r--drivers/net/ieee802154/fakelb.c2
-rw-r--r--drivers/net/ieee802154/mrf24j40.c2
-rw-r--r--include/net/cfg802154.h (renamed from include/net/wpan-phy.h)7
-rw-r--r--net/ieee802154/nl-mac.c2
-rw-r--r--net/ieee802154/nl-phy.c2
-rw-r--r--net/ieee802154/wpan-class.c2
-rw-r--r--net/mac802154/iface.c2
-rw-r--r--net/mac802154/mac_cmd.c2
-rw-r--r--net/mac802154/main.c2
-rw-r--r--net/mac802154/mib.c2
-rw-r--r--net/mac802154/monitor.c2
-rw-r--r--net/mac802154/tx.c2
15 files changed, 18 insertions, 17 deletions
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 @@
32 32
33#include <net/ieee802154.h> 33#include <net/ieee802154.h>
34#include <net/mac802154.h> 34#include <net/mac802154.h>
35#include <net/wpan-phy.h> 35#include <net/cfg802154.h>
36 36
37struct at86rf230_local; 37struct at86rf230_local;
38/* at86rf2xx chip depend data. 38/* 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 @@
23#include <linux/of_gpio.h> 23#include <linux/of_gpio.h>
24 24
25#include <net/mac802154.h> 25#include <net/mac802154.h>
26#include <net/wpan-phy.h> 26#include <net/cfg802154.h>
27#include <net/ieee802154.h> 27#include <net/ieee802154.h>
28 28
29#define SPI_COMMAND_BUFFER 3 29#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 @@
30#include <net/ieee802154_netdev.h> 30#include <net/ieee802154_netdev.h>
31#include <net/ieee802154.h> 31#include <net/ieee802154.h>
32#include <net/nl802154.h> 32#include <net/nl802154.h>
33#include <net/wpan-phy.h> 33#include <net/cfg802154.h>
34 34
35struct fakehard_priv { 35struct fakehard_priv {
36 struct wpan_phy *phy; 36 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 @@
25#include <linux/device.h> 25#include <linux/device.h>
26#include <linux/spinlock.h> 26#include <linux/spinlock.h>
27#include <net/mac802154.h> 27#include <net/mac802154.h>
28#include <net/wpan-phy.h> 28#include <net/cfg802154.h>
29 29
30static int numlbs = 1; 30static int numlbs = 1;
31 31
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 @@
18#include <linux/spi/spi.h> 18#include <linux/spi/spi.h>
19#include <linux/interrupt.h> 19#include <linux/interrupt.h>
20#include <linux/module.h> 20#include <linux/module.h>
21#include <net/wpan-phy.h> 21#include <net/cfg802154.h>
22#include <net/mac802154.h> 22#include <net/mac802154.h>
23#include <net/ieee802154.h> 23#include <net/ieee802154.h>
24 24
diff --git a/include/net/wpan-phy.h b/include/net/cfg802154.h
index 1e9795f116ba..5c674673ef20 100644
--- a/include/net/wpan-phy.h
+++ b/include/net/cfg802154.h
@@ -14,8 +14,8 @@
14 * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 14 * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
15 */ 15 */
16 16
17#ifndef WPAN_PHY_H 17#ifndef __NET_CFG802154_H
18#define WPAN_PHY_H 18#define __NET_CFG802154_H
19 19
20#include <linux/netdevice.h> 20#include <linux/netdevice.h>
21#include <linux/mutex.h> 21#include <linux/mutex.h>
@@ -99,4 +99,5 @@ static inline const char *wpan_phy_name(struct wpan_phy *phy)
99{ 99{
100 return dev_name(&phy->dev); 100 return dev_name(&phy->dev);
101} 101}
102#endif 102
103#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 @@
31#include <net/nl802154.h> 31#include <net/nl802154.h>
32#include <net/ieee802154.h> 32#include <net/ieee802154.h>
33#include <net/ieee802154_netdev.h> 33#include <net/ieee802154_netdev.h>
34#include <net/wpan-phy.h> 34#include <net/cfg802154.h>
35 35
36#include "ieee802154.h" 36#include "ieee802154.h"
37 37
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 @@
23#include <linux/if_arp.h> 23#include <linux/if_arp.h>
24#include <net/netlink.h> 24#include <net/netlink.h>
25#include <net/genetlink.h> 25#include <net/genetlink.h>
26#include <net/wpan-phy.h> 26#include <net/cfg802154.h>
27#include <net/af_ieee802154.h> 27#include <net/af_ieee802154.h>
28#include <net/ieee802154_netdev.h> 28#include <net/ieee802154_netdev.h>
29#include <net/rtnetlink.h> /* for rtnl_{un,}lock */ 29#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 @@
17#include <linux/module.h> 17#include <linux/module.h>
18#include <linux/device.h> 18#include <linux/device.h>
19 19
20#include <net/wpan-phy.h> 20#include <net/cfg802154.h>
21 21
22#include "ieee802154.h" 22#include "ieee802154.h"
23 23
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 @@
27#include <net/mac802154.h> 27#include <net/mac802154.h>
28#include <net/ieee802154_netdev.h> 28#include <net/ieee802154_netdev.h>
29#include <net/ieee802154.h> 29#include <net/ieee802154.h>
30#include <net/wpan-phy.h> 30#include <net/cfg802154.h>
31 31
32#include "ieee802154_i.h" 32#include "ieee802154_i.h"
33 33
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 @@
23 23
24#include <net/ieee802154.h> 24#include <net/ieee802154.h>
25#include <net/ieee802154_netdev.h> 25#include <net/ieee802154_netdev.h>
26#include <net/wpan-phy.h> 26#include <net/cfg802154.h>
27#include <net/mac802154.h> 27#include <net/mac802154.h>
28#include <net/nl802154.h> 28#include <net/nl802154.h>
29 29
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 @@
25#include <net/mac802154.h> 25#include <net/mac802154.h>
26#include <net/ieee802154_netdev.h> 26#include <net/ieee802154_netdev.h>
27#include <net/route.h> 27#include <net/route.h>
28#include <net/wpan-phy.h> 28#include <net/cfg802154.h>
29 29
30#include "ieee802154_i.h" 30#include "ieee802154_i.h"
31 31
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 @@
21 21
22#include <net/mac802154.h> 22#include <net/mac802154.h>
23#include <net/ieee802154_netdev.h> 23#include <net/ieee802154_netdev.h>
24#include <net/wpan-phy.h> 24#include <net/cfg802154.h>
25 25
26#include "ieee802154_i.h" 26#include "ieee802154_i.h"
27 27
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 @@
25#include <net/ieee802154.h> 25#include <net/ieee802154.h>
26#include <net/mac802154.h> 26#include <net/mac802154.h>
27#include <net/netlink.h> 27#include <net/netlink.h>
28#include <net/wpan-phy.h> 28#include <net/cfg802154.h>
29#include <linux/nl802154.h> 29#include <linux/nl802154.h>
30 30
31#include "ieee802154_i.h" 31#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 @@
23 23
24#include <net/ieee802154_netdev.h> 24#include <net/ieee802154_netdev.h>
25#include <net/mac802154.h> 25#include <net/mac802154.h>
26#include <net/wpan-phy.h> 26#include <net/cfg802154.h>
27 27
28#include "ieee802154_i.h" 28#include "ieee802154_i.h"
29 29
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-06 09:35:06 -0500