From d2494752c02b8df10a8b9247e4e398cfaa9ae219 Mon Sep 17 00:00:00 2001 From: Vivek Natarajan Date: Thu, 5 Feb 2009 20:05:15 +0530 Subject: [PATCH] --- yaml --- r: 134455 b: refs/heads/master c: 97d97b80984d0207e5c125c1b7b9467aad365d8d h: refs/heads/master i: 134453: bd8836f8d38e46eb87a16cfbfbe94dddb3224ebb 134451: 7d48b92551c738b984d9fe95e1f30466295fcd78 134447: 70dc2410e52f4039aeb18723fb3dfa1aadb987bb v: v3 --- [refs] | 2 +- trunk/net/mac80211/tx.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b5d74e47597a..7152fb031f4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dec59d6faffb44e741d9c19ffdf368d69a968a54 +refs/heads/master: 97d97b80984d0207e5c125c1b7b9467aad365d8d diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c index f1c726d94f47..bf73f6d561b7 100644 --- a/trunk/net/mac80211/tx.c +++ b/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];