]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
mac80211: fix unbalanced locking in ieee80211_get_buffered_bc
authorTomas Winkler <tomas.winkler@intel.com>
Mon, 2 Jun 2008 17:31:56 +0000 (20:31 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 3 Jun 2008 19:00:29 +0000 (15:00 -0400)
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>
net/mac80211/tx.c

index 332ddcb1068a1b937fade056f9250690c6121639..4214d039fbc6d2d4cf36e16561274450b8dfb5d8 100644 (file)
@@ -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);