diff options
| author | Yogesh Ashok Powar <yogeshp@marvell.com> | 2013-01-03 13:21:25 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-07 15:17:00 -0500 |
| commit | 5f2a14940db23350612071a3c906c8960e3ceb9a (patch) | |
| tree | f3bf9ef146fb1069a01d392e50fc9cc91bea5df5 /drivers/net | |
| parent | 96769caf8a755c9767b1a5c56fe71e062c2ad7da (diff) | |
| download | talos-obmc-linux-5f2a14940db23350612071a3c906c8960e3ceb9a.tar.gz talos-obmc-linux-5f2a14940db23350612071a3c906c8960e3ceb9a.zip | |
mwl8k: set ack policy to normal
Set ACK policy to NORMAL when its not going to
be an AMPDU packet.
Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/mwl8k.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index a13f690f1851..7df18faae1b6 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/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, |
