From: Tomas Winkler <tomas.winkler@intel.com>
Date: Mon, 2 Jun 2008 17:31:56 +0000 (+0300)
Subject: mac80211: fix unbalanced locking in ieee80211_get_buffered_bc
X-Git-Tag: MMI-PSA29.97-13-9~33552^2~338^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b97e77e0446f0702de7fa0f5d2c52acf42d0289f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

mac80211: fix unbalanced locking in ieee80211_get_buffered_bc

This patch fixes unbalanced locking in ieee80211_get_buffered_bc

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 332ddcb1068a..4214d039fbc6 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2011,7 +2011,7 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw,
 	}
 
 	if (WARN_ON(tx.skb != skb))
-		return NULL;
+		res = TX_DROP;
 
 	if (res == TX_DROP) {
 		I802_DEBUG_INC(local->tx_handlers_drop);