---

yaml
---
r: 134455
b: refs/heads/master
c: 97d97b8
h: refs/heads/master
i:
  134453: bd8836f
  134451: 7d48b92
  134447: 70dc241
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dec59d6faffb44e741d9c19ffdf368d69a968a54
+refs/heads/master: 97d97b80984d0207e5c125c1b7b9467aad365d8d

trunk/net/mac80211/tx.c

@@ -35,6 +35,7 @@
 #define IEEE80211_TX_OK		0
 #define IEEE80211_TX_AGAIN	1
 #define IEEE80211_TX_FRAG_AGAIN	2
+#define IEEE80211_TX_PENDING	3
 
 /* misc utils */
 
@@ -1085,7 +1086,7 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
 
 	if (skb) {
 		if (netif_subqueue_stopped(local->mdev, skb))
-			return IEEE80211_TX_AGAIN;
+			return IEEE80211_TX_PENDING;
 
 		ret = local->ops->tx(local_to_hw(local), skb);
 		if (ret)
@@ -1211,8 +1212,9 @@ static int ieee80211_tx(struct net_device *dev, struct sk_buff *skb)
 		 * queues, there's no reason for a driver to reject
 		 * a frame there, warn and drop it.
 		 */
-		if (WARN_ON(info->flags & IEEE80211_TX_CTL_AMPDU))
-			goto drop;
+		if (ret != IEEE80211_TX_PENDING)
+			if (WARN_ON(info->flags & IEEE80211_TX_CTL_AMPDU))
+				goto drop;
 
 		store = &local->pending_packet[queue];