Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60741361 authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files

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: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent d98be45b

net/mac802154/ieee802154_i.h

+6 −2
Original line number Diff line number Diff line
@@ -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;

net/mac802154/main.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

net/mac802154/rx.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

net/mac802154/tx.c

+1 −1
Original line number Diff line number Diff line
@@ -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);