summaryrefslogtreecommitdiff
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-01-16 21:47:40 +0100
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:10:43 -0800
commitf99b751fca5b16bea53c0d6724935e1949350052 (patch)
tree82d85bd1be31261b9c6b9b4b8926c3f52a21c656 /net/mac80211/rx.c
parentbfe6a50156ab0c33729378fae7038bce3c6c5184 (diff)
downloadlinux-3.10-f99b751fca5b16bea53c0d6724935e1949350052.tar.gz
linux-3.10-f99b751fca5b16bea53c0d6724935e1949350052.tar.bz2
linux-3.10-f99b751fca5b16bea53c0d6724935e1949350052.zip
mac80211: fix RCU locking in __ieee80211_rx_handle_packet
Commit c7a51bda ("mac80211: restructure __ieee80211_rx") extracted __ieee80211_rx_handle_packet out of __ieee80211_rx and hence changed the locking rules for __ieee80211_rx_handle_packet(), it is now invoked under RCU lock. There is, however, one instance left where it contains an rcu_read_unlock() in an error path, which is a bug. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 465fce0f62a..96b0faf40b1 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1730,7 +1730,6 @@ void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, struct sk_buff *skb,
ieee80211_invoke_rx_handlers(local, local->rx_handlers, &rx,
rx.sta);
sta_info_put(sta);
- rcu_read_unlock();
return;
}