From b71c2ed4c9578ed94e0899550936f98c29bbade3 Mon Sep 17 00:00:00 2001 From: Yogesh Ashok Powar Date: Thu, 3 Jan 2013 13:21:25 +0530 Subject: [PATCH] --- yaml --- r: 351828 b: refs/heads/master c: 5f2a14940db23350612071a3c906c8960e3ceb9a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mwl8k.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 78ac572b23f5..0b060cc1ada7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96769caf8a755c9767b1a5c56fe71e062c2ad7da +refs/heads/master: 5f2a14940db23350612071a3c906c8960e3ceb9a diff --git a/trunk/drivers/net/wireless/mwl8k.c b/trunk/drivers/net/wireless/mwl8k.c index a13f690f1851..7df18faae1b6 100644 --- a/trunk/drivers/net/wireless/mwl8k.c +++ b/trunk/drivers/net/wireless/mwl8k.c @@ -1926,6 +1926,7 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, stream = mwl8k_lookup_stream(hw, sta->addr, tid); if (stream != NULL) { if (stream->state == AMPDU_STREAM_ACTIVE) { + WARN_ON(!(qos & MWL8K_QOS_ACK_POLICY_BLOCKACK)); txpriority = stream->idx + MWL8K_TX_WMM_QUEUES; index = stream->idx + MWL8K_TX_WMM_QUEUES; } else if (stream->state == AMPDU_STREAM_NEW) { @@ -1969,6 +1970,9 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, } } spin_unlock(&priv->stream_lock); + } else { + qos &= ~MWL8K_QOS_ACK_POLICY_MASK; + qos |= MWL8K_QOS_ACK_POLICY_NORMAL; } dma = pci_map_single(priv->pdev, skb->data,