leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac802154: fix ieee802154_rx handling

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

Signed-off-by: Varka Bhadram <varkabhadram@gmail.com>
Acked-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Varka Bhadram 2015-07-07 10:50:43 +05:30 committed by Marcel Holtmann
parent 729a8989b3
commit d10270ce94
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/mac802154/ieee802154_i.h
View File

@ -124,7 +124,7 @@ ieee802154_sdata_running(struct ieee802154_sub_if_data *sdata)
extern struct ieee802154_mlme_ops mac802154_mlme_wpan; 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 netdev_tx_t
ieee802154_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev); ieee802154_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev);
netdev_tx_t netdev_tx_t

2
net/mac802154/main.c
View File

@ -40,7 +40,7 @@ static void ieee802154_tasklet_handler(unsigned long data)
* netstack. * netstack.
*/ */
skb->pkt_type = 0; skb->pkt_type = 0;
ieee802154_rx(&local->hw, skb); ieee802154_rx(local, skb);
break; break;
default: default:
WARN(1, "mac802154: Packet is of unknown type %d\n", WARN(1, "mac802154: Packet is of unknown type %d\n",

3
net/mac802154/rx.c
View File

@ -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; u16 crc;
WARN_ON_ONCE(softirq_count() == 0); WARN_ON_ONCE(softirq_count() == 0);