diff --git a/[refs] b/[refs]
index dbee886e5e61..64dbcefc4018 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b2121417eff64125bdb7f322d3b533e06d73dae
+refs/heads/master: b97e77e0446f0702de7fa0f5d2c52acf42d0289f
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index 332ddcb1068a..4214d039fbc6 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/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);