lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mwl8k: force AP mode to use non-AMPDU frames

Browse Source 
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>
This commit is contained in:
Nishant Sarmukadam
2010-11-01 17:55:48 -07:00
committed by John W. Linville
parent 3eedb6f436
commit c0bf9ca98e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/mwl8k.c
View File

@@ -1125,10 +1125,12 @@ struct mwl8k_tx_desc {
__le32 reserved; __le32 reserved;
__le16 rate_info; __le16 rate_info;
__u8 peer_id; __u8 peer_id;
__u8 tx_frag_cnt; __u8 xmitcontrol;
} __packed; } __packed;
#define MWL8K_TX_DESCS 128 #define MWL8K_TX_DESCS 128
#define MWL8K_XMITCONTROL_NON_AMPDU 0x04
static int mwl8k_txq_init(struct ieee80211_hw *hw, int index) 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; tx->peer_id = MWL8K_STA(tx_info->control.sta)->peer_id;
else else
tx->peer_id = 0; tx->peer_id = 0;
if (priv->ap_fw)
tx->xmitcontrol = MWL8K_XMITCONTROL_NON_AMPDU;
wmb(); wmb();
tx->status = cpu_to_le32(MWL8K_TXD_STATUS_FW_OWNED | txstatus); tx->status = cpu_to_le32(MWL8K_TXD_STATUS_FW_OWNED | txstatus);