Skip to content

Commit

Permalink
ieee802154: move wpan-phy.h to cfg802154.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexander Aring authored and Marcel Holtmann committed Oct 25, 2014
1 parent 15859a5 commit 5ad60d3
Show file tree
Hide file tree
Showing 15 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ieee802154/at86rf230.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ieee802154/cc2520.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ieee802154/fakehard.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ieee802154/fakelb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ieee802154/mrf24j40.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
7 changes: 4 additions & 3 deletions include/net/wpan-phy.h → include/net/cfg802154.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 */
2 changes: 1 addition & 1 deletion net/ieee802154/nl-mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion net/ieee802154/nl-phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion net/ieee802154/wpan-class.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <linux/module.h>
#include <linux/device.h>

#include <net/wpan-phy.h>
#include <net/cfg802154.h>

#include "ieee802154.h"

Expand Down
2 changes: 1 addition & 1 deletion net/mac802154/iface.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion net/mac802154/mac_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion net/mac802154/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion net/mac802154/mib.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion net/mac802154/monitor.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion net/mac802154/tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 5ad60d3

Please sign in to comment.