FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-03-04 10:38:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mac802154: rx: move rcu locking

Browse Source 
Instead of twice lock and unlock mechanism this patch hold these locks
only once at one position.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Alexander Aring 2014-10-27 17:13:39 +01:00 committed by Marcel Holtmann
parent 9cf215d073
commit e176b681b0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/mac802154/rx.c
View File

@ -205,7 +205,6 @@ mac802154_wpans_rx(struct ieee802154_local *local, struct sk_buff *skb)
return; return;
} }
rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->interfaces, list) { list_for_each_entry_rcu(sdata, &local->interfaces, list) {
if (sdata->type != IEEE802154_DEV_WPAN || if (sdata->type != IEEE802154_DEV_WPAN ||
!netif_running(sdata->dev)) !netif_running(sdata->dev))
@ -215,7 +214,6 @@ mac802154_wpans_rx(struct ieee802154_local *local, struct sk_buff *skb)
skb = NULL; skb = NULL;
break; break;
} }
rcu_read_unlock();
if (skb) if (skb)
kfree_skb(skb); kfree_skb(skb);
@ -234,7 +232,6 @@ mac802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb)
skb->pkt_type = PACKET_OTHERHOST; skb->pkt_type = PACKET_OTHERHOST;
skb->protocol = htons(ETH_P_IEEE802154); skb->protocol = htons(ETH_P_IEEE802154);
rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->interfaces, list) { list_for_each_entry_rcu(sdata, &local->interfaces, list) {
if (sdata->type != IEEE802154_DEV_MONITOR || if (sdata->type != IEEE802154_DEV_MONITOR ||
!netif_running(sdata->dev)) !netif_running(sdata->dev))
@ -249,7 +246,6 @@ mac802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb)
netif_rx_ni(skb2); netif_rx_ni(skb2);
} }
rcu_read_unlock();
} }
void ieee802154_rx(struct ieee802154_hw *hw, struct sk_buff *skb) void ieee802154_rx(struct ieee802154_hw *hw, struct sk_buff *skb)
@ -273,9 +269,13 @@ void ieee802154_rx(struct ieee802154_hw *hw, struct sk_buff *skb)
skb_trim(skb, skb->len - 2); /* CRC */ skb_trim(skb, skb->len - 2); /* CRC */
} }
rcu_read_lock();
mac802154_monitors_rx(local, skb); mac802154_monitors_rx(local, skb);
mac802154_wpans_rx(local, skb); mac802154_wpans_rx(local, skb);
rcu_read_unlock();
return; return;
fail: fail: