aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-01-16 15:47:40 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:10:43 -0500
commitf99b751fca5b16bea53c0d6724935e1949350052 (patch)
tree82d85bd1be31261b9c6b9b4b8926c3f52a21c656
parentbfe6a50156ab0c33729378fae7038bce3c6c5184 (diff)
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>
-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 465fce0f62ad..96b0faf40b11 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,
1730 ieee80211_invoke_rx_handlers(local, local->rx_handlers, &rx, 1730 ieee80211_invoke_rx_handlers(local, local->rx_handlers, &rx,
1731 rx.sta); 1731 rx.sta);
1732 sta_info_put(sta); 1732 sta_info_put(sta);
1733 rcu_read_unlock();
1734 return; 1733 return;
1735 } 1734 }
1736 1735