diff options
author | Alexander Aring <alex.aring@gmail.com> | 2014-10-25 11:16:35 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-10-25 15:55:37 -0400 |
commit | a5e1ec538f54c4cb8ec9ce30867cfbab57225280 (patch) | |
tree | c00e77229c84408c9a141da22c738e8976f5ef3d /net/mac802154/ieee802154_i.h | |
parent | 5a50439775853a8d565115edb63a5ab4bb780479 (diff) |
mac802154: rename mac802154_priv to ieee802154_local
This patch rename the mac802154_priv to ieee802154_local. The
mac802154_priv structure is like ieee80211_local and so we name it
ieee802154_local.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/mac802154/ieee802154_i.h')
-rw-r--r-- | net/mac802154/ieee802154_i.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h index 0cb98e87645a..eb55cd2d0b34 100644 --- a/net/mac802154/ieee802154_i.h +++ b/net/mac802154/ieee802154_i.h | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "llsec.h" | 26 | #include "llsec.h" |
27 | 27 | ||
28 | /* mac802154 device private data */ | 28 | /* mac802154 device private data */ |
29 | struct mac802154_priv { | 29 | struct ieee802154_local { |
30 | struct ieee802154_hw hw; | 30 | struct ieee802154_hw hw; |
31 | struct ieee802154_ops *ops; | 31 | struct ieee802154_ops *ops; |
32 | 32 | ||
@@ -69,7 +69,7 @@ struct mac802154_priv { | |||
69 | struct mac802154_sub_if_data { | 69 | struct mac802154_sub_if_data { |
70 | struct list_head list; /* the ieee802154_priv->slaves list */ | 70 | struct list_head list; /* the ieee802154_priv->slaves list */ |
71 | 71 | ||
72 | struct mac802154_priv *hw; | 72 | struct ieee802154_local *hw; |
73 | struct net_device *dev; | 73 | struct net_device *dev; |
74 | 74 | ||
75 | int type; | 75 | int type; |
@@ -99,7 +99,7 @@ struct mac802154_sub_if_data { | |||
99 | struct mac802154_llsec sec; | 99 | struct mac802154_llsec sec; |
100 | }; | 100 | }; |
101 | 101 | ||
102 | #define mac802154_to_priv(_hw) container_of(_hw, struct mac802154_priv, hw) | 102 | #define mac802154_to_priv(_hw) container_of(_hw, struct ieee802154_local, hw) |
103 | 103 | ||
104 | #define MAC802154_CHAN_NONE 0xff /* No channel is assigned */ | 104 | #define MAC802154_CHAN_NONE 0xff /* No channel is assigned */ |
105 | 105 | ||
@@ -109,13 +109,13 @@ extern struct ieee802154_mlme_ops mac802154_mlme_wpan; | |||
109 | int mac802154_slave_open(struct net_device *dev); | 109 | int mac802154_slave_open(struct net_device *dev); |
110 | int mac802154_slave_close(struct net_device *dev); | 110 | int mac802154_slave_close(struct net_device *dev); |
111 | 111 | ||
112 | void mac802154_monitors_rx(struct mac802154_priv *priv, struct sk_buff *skb); | 112 | void mac802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb); |
113 | void mac802154_monitor_setup(struct net_device *dev); | 113 | void mac802154_monitor_setup(struct net_device *dev); |
114 | 114 | ||
115 | void mac802154_wpans_rx(struct mac802154_priv *priv, struct sk_buff *skb); | 115 | void mac802154_wpans_rx(struct ieee802154_local *local, struct sk_buff *skb); |
116 | void mac802154_wpan_setup(struct net_device *dev); | 116 | void mac802154_wpan_setup(struct net_device *dev); |
117 | 117 | ||
118 | netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb, | 118 | netdev_tx_t mac802154_tx(struct ieee802154_local *local, struct sk_buff *skb, |
119 | u8 page, u8 chan); | 119 | u8 page, u8 chan); |
120 | 120 | ||
121 | /* MIB callbacks */ | 121 | /* MIB callbacks */ |