diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-15 07:06:44 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-15 07:06:44 (GMT) |
| commit | ac178ef0ae9eb44fd527d87aa9b6394e05f56e1f (patch) | |
| tree | 5d6bd46ecf9ce989134d3c460e1ecf5dd1fceadc /net/mac80211/tx.c | |
| parent | f3a7c66b5ce0b75a9774a50b5dcce93e5ba28370 (diff) | |
| parent | 6d08b9b9c6eb2414c4a037407dd121298a74fb36 (diff) | |
| download | linux-fsl-qoriq-ac178ef0ae9eb44fd527d87aa9b6394e05f56e1f.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index f1c726d..bf73f6d 100644 --- a/net/mac80211/tx.c +++ b/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 @@ retry: * 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]; |