1 files changed, 4 insertions, 2 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index edacad1fb1dc..9e5dff1c8f27 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1170,13 +1170,15 @@ static int __ieee80211_tx(struct ieee80211_local *local,
                 }
 
                 ret = drv_tx(local, skb);
-                info->control.vif = &sdata->vif;
                 if (WARN_ON(ret != NETDEV_TX_OK && skb->len != len)) {
                         dev_kfree_skb(skb);
                         ret = NETDEV_TX_OK;
                 }
-                if (ret != NETDEV_TX_OK)
+                if (ret != NETDEV_TX_OK) {
+                        info->control.vif = &sdata->vif;
                         return IEEE80211_TX_AGAIN;
+                }
+
                 *skbp = skb = next;
                 ieee80211_led_tx(local, 1);
                 fragm = true;