Skip to content

Commit

Permalink
mwl8k: revert unnecessary modification of tx descriptor
Browse files Browse the repository at this point in the history
This reverts change 783391c443728febc669e40597193308460e7b4f.
The stabilized AP v1 firmware uses the same tx descriptor as
the STA firmware.

Signed-off-by: Brian Cavagnolo <brian@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Brian Cavagnolo authored and John W. Linville committed Nov 16, 2010
1 parent ae63a33 commit a1fe24b
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/net/wireless/mwl8k.c
Original file line number Diff line number Diff line change
Expand Up @@ -1125,12 +1125,10 @@ struct mwl8k_tx_desc {
__le32 reserved;
__le16 rate_info;
__u8 peer_id;
__u8 xmitcontrol;
__u8 tx_frag_cnt;
} __packed;

#define MWL8K_TX_DESCS 128
#define MWL8K_XMITCONTROL_NON_AMPDU 0x04


static int mwl8k_txq_init(struct ieee80211_hw *hw, int index)
{
Expand Down Expand Up @@ -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;
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);

Expand Down

0 comments on commit a1fe24b

Please sign in to comment.