diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 332ddcb1068a1b937fade056f9250690c6121639..4214d039fbc6d2d4cf36e16561274450b8dfb5d8 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);