Commit a1fe24b0 authored by Brian Cavagnolo's avatar Brian Cavagnolo Committed by John W. Linville

mwl8k: revert unnecessary modification of tx descriptor

This reverts change 783391c443728febc669e40597193308460e7b4f.
The stabilized AP v1 firmware uses the same tx descriptor as
the STA firmware.
Signed-off-by: default avatarBrian Cavagnolo <brian@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ae63a33e
...@@ -1125,12 +1125,10 @@ struct mwl8k_tx_desc { ...@@ -1125,12 +1125,10 @@ struct mwl8k_tx_desc {
__le32 reserved; __le32 reserved;
__le16 rate_info; __le16 rate_info;
__u8 peer_id; __u8 peer_id;
__u8 xmitcontrol; __u8 tx_frag_cnt;
} __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)
{ {
...@@ -1450,9 +1448,6 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb) ...@@ -1450,9 +1448,6 @@ 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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment