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>

diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index b7cf41c989ec78fd31d0b21d11f9e0733b219733..41e29b00e7a06ea1e7de2c5bb93a7268a805a280 100644 (file)
--- 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 34e7e617611acc059c91097fa34b7f52f618bd73..c7799faf508b4d98881adbb315664fcb659b5ea6 100644 (file)
--- 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 dc01817a92c5b1d9c002920a2c25e932218963b5..1b5e8e332b9b72ab2acfdfe17048140c457f93d3 100644 (file)
--- 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 b6039c75d175cac3235796c6e83cc8865610eb3b..36844264b20b76a96632cb5d3f1ee90f3d856e5d 100644 (file)
--- 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);