diff options
| author | Nishant Sarmukadam <nishants@marvell.com> | 2010-11-01 17:55:48 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-15 13:25:36 -0500 |
| commit | c0bf9ca98e07ca72c444a6cfb272aafa9890b9b6 (patch) | |
| tree | 242fc11c9d8935757f85dd444c085e136f3aa452 /drivers/net/wireless/mwl8k.c | |
| parent | 3eedb6f436858f3e864139dc184adc9a51440c92 (diff) | |
| download | linux-3.10-c0bf9ca98e07ca72c444a6cfb272aafa9890b9b6.tar.gz linux-3.10-c0bf9ca98e07ca72c444a6cfb272aafa9890b9b6.tar.bz2 linux-3.10-c0bf9ca98e07ca72c444a6cfb272aafa9890b9b6.zip | |
mwl8k: force AP mode to use non-AMPDU frames
AP firmware uses xmitcontrol to differentiate between AMPDU
and non-AMPDU frames. As the support for AMPDU is not yet
added, set xmitcontrol to non-AMPDU for all tx frames for AP
firmware. This field will be set to indicate ampdu/non-ampdu
frames when tx AMPDU support is added.
Signed-off-by: Pradeep Nemavat <pnemavat@marvell.com>
Signed-off-by: Brian Cavagnolo <brian@cozybit.com>
Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwl8k.c')
| -rw-r--r-- | drivers/net/wireless/mwl8k.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index f152a25be59..1bbcd7c1d02 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c @@ -1125,10 +1125,12 @@ struct mwl8k_tx_desc { __le32 reserved; __le16 rate_info; __u8 peer_id; - __u8 tx_frag_cnt; + __u8 xmitcontrol; } __packed; #define MWL8K_TX_DESCS 128 +#define MWL8K_XMITCONTROL_NON_AMPDU 0x04 + static int mwl8k_txq_init(struct ieee80211_hw *hw, int index) { @@ -1448,6 +1450,9 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb) tx->peer_id = MWL8K_STA(tx_info->control.sta)->peer_id; else tx->peer_id = 0; + + if (priv->ap_fw) + tx->xmitcontrol = MWL8K_XMITCONTROL_NON_AMPDU; wmb(); tx->status = cpu_to_le32(MWL8K_TXD_STATUS_FW_OWNED | txstatus); |