aboutsummaryrefslogtreecommitdiff
path: root/net/mac802154/rx.c
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-10-27 17:13:39 +0100
committerMarcel Holtmann <marcel@holtmann.org>2014-10-27 18:07:45 +0100
commite176b681b00d2b60e9231072d3ca841f9ddc74ea (patch)
treeede73bf25281f0689606ef2ceb35dfd74976e5e4 /net/mac802154/rx.c
parent9cf215d0733256687796ef1161b7b358be1b0602 (diff)
downloadlinux-stericsson-e176b681b00d2b60e9231072d3ca841f9ddc74ea.tar.gz
mac802154: rx: move rcu locking
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>
Diffstat (limited to 'net/mac802154/rx.c')
-rw-r--r--net/mac802154/rx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c
index c2999804126a..689bb7ff5b2a 100644
--- a/net/mac802154/rx.c
+++ b/net/mac802154/rx.c
@@ -205,7 +205,6 @@ mac802154_wpans_rx(struct ieee802154_local *local, struct sk_buff *skb)
return;
}
- rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
if (sdata->type != IEEE802154_DEV_WPAN ||
!netif_running(sdata->dev))
@@ -215,7 +214,6 @@ mac802154_wpans_rx(struct ieee802154_local *local, struct sk_buff *skb)
skb = NULL;
break;
}
- rcu_read_unlock();
if (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->protocol = htons(ETH_P_IEEE802154);
- rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
if (sdata->type != IEEE802154_DEV_MONITOR ||
!netif_running(sdata->dev))
@@ -249,7 +246,6 @@ mac802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb)
netif_rx_ni(skb2);
}
- rcu_read_unlock();
}
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 */
}
+ rcu_read_lock();
+
mac802154_monitors_rx(local, skb);
mac802154_wpans_rx(local, skb);
+ rcu_read_unlock();
+
return;
fail: