Commit 5ad60d36 authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann

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: default avatarAlexander Aring <alex.aring@gmail.com>
Cc: Alan Ott <alan@signal11.us>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 15859a5e
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <net/ieee802154.h> #include <net/ieee802154.h>
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/wpan-phy.h> #include <net/cfg802154.h>
struct at86rf230_local; struct at86rf230_local;
/* at86rf2xx chip depend data. /* at86rf2xx chip depend data.
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/wpan-phy.h> #include <net/cfg802154.h>
#include <net/ieee802154.h> #include <net/ieee802154.h>
#define SPI_COMMAND_BUFFER 3 #define SPI_COMMAND_BUFFER 3
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <net/ieee802154_netdev.h> #include <net/ieee802154_netdev.h>
#include <net/ieee802154.h> #include <net/ieee802154.h>
#include <net/nl802154.h> #include <net/nl802154.h>
#include <net/wpan-phy.h> #include <net/cfg802154.h>
struct fakehard_priv { struct fakehard_priv {
struct wpan_phy *phy; struct wpan_phy *phy;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/wpan-phy.h> #include <net/cfg802154.h>
static int numlbs = 1; static int numlbs = 1;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h> #include <linux/module.h>
#include <net/wpan-phy.h> #include <net/cfg802154.h>
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/ieee802154.h> #include <net/ieee802154.h>
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
*/ */
#ifndef WPAN_PHY_H #ifndef __NET_CFG802154_H
#define WPAN_PHY_H #define __NET_CFG802154_H
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/mutex.h> #include <linux/mutex.h>
...@@ -99,4 +99,5 @@ static inline const char *wpan_phy_name(struct wpan_phy *phy) ...@@ -99,4 +99,5 @@ static inline const char *wpan_phy_name(struct wpan_phy *phy)
{ {
return dev_name(&phy->dev); return dev_name(&phy->dev);
} }
#endif
#endif /* __NET_CFG802154_H */
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <net/nl802154.h> #include <net/nl802154.h>
#include <net/ieee802154.h> #include <net/ieee802154.h>
#include <net/ieee802154_netdev.h> #include <net/ieee802154_netdev.h>
#include <net/wpan-phy.h> #include <net/cfg802154.h>
#include "ieee802154.h" #include "ieee802154.h"
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <net/netlink.h> #include <net/netlink.h>
#include <net/genetlink.h> #include <net/genetlink.h>
#include <net/wpan-phy.h> #include <net/cfg802154.h>
#include <net/af_ieee802154.h> #include <net/af_ieee802154.h>
#include <net/ieee802154_netdev.h> #include <net/ieee802154_netdev.h>
#include <net/rtnetlink.h> /* for rtnl_{un,}lock */ #include <net/rtnetlink.h> /* for rtnl_{un,}lock */
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/device.h> #include <linux/device.h>
#include <net/wpan-phy.h> #include <net/cfg802154.h>
#include "ieee802154.h" #include "ieee802154.h"
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/ieee802154_netdev.h> #include <net/ieee802154_netdev.h>
#include <net/ieee802154.h> #include <net/ieee802154.h>
#include <net/wpan-phy.h> #include <net/cfg802154.h>
#include "ieee802154_i.h" #include "ieee802154_i.h"
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <net/ieee802154.h> #include <net/ieee802154.h>
#include <net/ieee802154_netdev.h> #include <net/ieee802154_netdev.h>
#include <net/wpan-phy.h> #include <net/cfg802154.h>
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/nl802154.h> #include <net/nl802154.h>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/ieee802154_netdev.h> #include <net/ieee802154_netdev.h>
#include <net/route.h> #include <net/route.h>
#include <net/wpan-phy.h> #include <net/cfg802154.h>
#include "ieee802154_i.h" #include "ieee802154_i.h"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/ieee802154_netdev.h> #include <net/ieee802154_netdev.h>
#include <net/wpan-phy.h> #include <net/cfg802154.h>
#include "ieee802154_i.h" #include "ieee802154_i.h"
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <net/ieee802154.h> #include <net/ieee802154.h>
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/netlink.h> #include <net/netlink.h>
#include <net/wpan-phy.h> #include <net/cfg802154.h>
#include <linux/nl802154.h> #include <linux/nl802154.h>
#include "ieee802154_i.h" #include "ieee802154_i.h"
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <net/ieee802154_netdev.h> #include <net/ieee802154_netdev.h>
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/wpan-phy.h> #include <net/cfg802154.h>
#include "ieee802154_i.h" #include "ieee802154_i.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment