diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index f57f7963ca37..098b32947c2b 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -3953,7 +3953,8 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,
 			ieee80211_free_txskb(&local->hw, skb);
 			goto begin;
 		} else {
-			vif = NULL;
+			info->control.vif = NULL;
+			return skb;
 		}
 		break;
 	case NL80211_IFTYPE_AP_VLAN: