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

Commit d10270ce authored by Varka Bhadram's avatar Varka Bhadram Committed by Marcel Holtmann
Browse files

mac802154: fix ieee802154_rx handling 



Instead of passing ieee802154_hw pointer to ieee802154_rx,
we can directly pass the ieee802154_local pointer.

Signed-off-by: default avatarVarka Bhadram <varkabhadram@gmail.com>
Acked-by: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 729a8989

net/mac802154/ieee802154_i.h

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ ieee802154_sdata_running(struct ieee802154_sub_if_data *sdata) 


extern struct ieee802154_mlme_ops mac802154_mlme_wpan;



void ieee802154_rx(struct ieee802154_hw *hw, struct sk_buff *skb);

void ieee802154_rx(struct ieee802154_local *local, struct sk_buff *skb);

netdev_tx_t

ieee802154_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev);

netdev_tx_t

net/mac802154/main.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static void ieee802154_tasklet_handler(unsigned long data) 
			 * netstack.

			 */

			skb->pkt_type = 0;

			ieee802154_rx(&local->hw, skb);

			ieee802154_rx(local, skb);

			break;

		default:

			WARN(1, "mac802154: Packet is of unknown type %d\n",

net/mac802154/rx.c

+1 −2
Original line number Diff line number Diff line
@@ -246,9 +246,8 @@ ieee802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb) 
	}

}



void ieee802154_rx(struct ieee802154_hw *hw, struct sk_buff *skb)

void ieee802154_rx(struct ieee802154_local *local, struct sk_buff *skb)

{

	struct ieee802154_local *local = hw_to_local(hw);

	u16 crc;



	WARN_ON_ONCE(softirq_count() == 0);