diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2014-10-25 17:16:39 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-10-25 21:55:38 +0200 |
| commit | 60741361c3ca229a1dbb18e05d11e97b7ea75d69 (patch) | |
| tree | 71194fea29b7c5a5f21344fc5046c9464df55f46 /net | |
| parent | mac802154: rename sdata slaves and slaves_mtx (diff) | |
| download | linux-60741361c3ca229a1dbb18e05d11e97b7ea75d69.tar.xz linux-60741361c3ca229a1dbb18e05d11e97b7ea75d69.zip | |
mac802154: introduce hw_to_local function
This patch replace the mac802154_to_priv macro with a static inline
function named hw_to_local. This brings a similar naming convention like
mac80211 stack.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac802154/ieee802154_i.h | 8 | ||||
| -rw-r--r-- | net/mac802154/main.c | 6 | ||||
| -rw-r--r-- | net/mac802154/rx.c | 4 | ||||
| -rw-r--r-- | net/mac802154/tx.c | 2 |
4 files changed, 12 insertions, 8 deletions
diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h index b7cf41c989ec..41e29b00e7a0 100644 --- a/net/mac802154/ieee802154_i.h +++ b/net/mac802154/ieee802154_i.h @@ -99,10 +99,14 @@ struct ieee802154_sub_if_data { struct mac802154_llsec sec; }; -#define mac802154_to_priv(_hw) container_of(_hw, struct ieee802154_local, hw) - #define MAC802154_CHAN_NONE 0xff /* No channel is assigned */ +static inline struct ieee802154_local * +hw_to_local(struct ieee802154_hw *hw) +{ + return container_of(hw, struct ieee802154_local, hw); +} + extern struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced; extern struct ieee802154_mlme_ops mac802154_mlme_wpan; diff --git a/net/mac802154/main.c b/net/mac802154/main.c index 34e7e617611a..c7799faf508b 100644 --- a/net/mac802154/main.c +++ b/net/mac802154/main.c @@ -289,7 +289,7 @@ EXPORT_SYMBOL(ieee802154_alloc_hw); void ieee802154_free_hw(struct ieee802154_hw *hw) { - struct ieee802154_local *local = mac802154_to_priv(hw); + struct ieee802154_local *local = hw_to_local(hw); BUG_ON(!list_empty(&local->interfaces)); @@ -301,7 +301,7 @@ EXPORT_SYMBOL(ieee802154_free_hw); int ieee802154_register_hw(struct ieee802154_hw *hw) { - struct ieee802154_local *local = mac802154_to_priv(hw); + struct ieee802154_local *local = hw_to_local(hw); int rc = -ENOSYS; if (hw->flags & IEEE802154_HW_TXPOWER) { @@ -381,7 +381,7 @@ EXPORT_SYMBOL(ieee802154_register_hw); void ieee802154_unregister_hw(struct ieee802154_hw *hw) { - struct ieee802154_local *local = mac802154_to_priv(hw); + struct ieee802154_local *local = hw_to_local(hw); struct ieee802154_sub_if_data *sdata, *next; flush_workqueue(local->dev_workqueue); diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c index dc01817a92c5..1b5e8e332b9b 100644 --- a/net/mac802154/rx.c +++ b/net/mac802154/rx.c @@ -49,7 +49,7 @@ struct rx_work { static void mac802154_subif_rx(struct ieee802154_hw *hw, struct sk_buff *skb, u8 lqi) { - struct ieee802154_local *local = mac802154_to_priv(hw); + struct ieee802154_local *local = hw_to_local(hw); mac_cb(skb)->lqi = lqi; skb->protocol = htons(ETH_P_IEEE802154); @@ -90,7 +90,7 @@ static void mac802154_rx_worker(struct work_struct *work) void ieee802154_rx_irqsafe(struct ieee802154_hw *hw, struct sk_buff *skb, u8 lqi) { - struct ieee802154_local *local = mac802154_to_priv(hw); + struct ieee802154_local *local = hw_to_local(hw); struct rx_work *work; if (!skb) diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c index b6039c75d175..36844264b20b 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c @@ -88,7 +88,7 @@ netdev_tx_t mac802154_tx(struct ieee802154_local *local, struct sk_buff *skb, goto err_tx; } - mac802154_monitors_rx(mac802154_to_priv(&local->hw), skb); + mac802154_monitors_rx(local, skb); if (!(local->hw.flags & IEEE802154_HW_OMIT_CKSUM)) { u16 crc = crc_ccitt(0, skb->data, skb->len); |