From 335d464016566d005a3d3bba0ec24e1271383fe5 Mon Sep 17 00:00:00 2001
From: Brian Cavagnolo <brian@cozybit.com>
Date: Fri, 12 Nov 2010 17:23:47 -0800
Subject: [PATCH] --- yaml --- r: 224547 b: refs/heads/master c:
 a1fe24b0fd8bf16b4e551ae3fb785bfc574b9ffb h: refs/heads/master i:   224545:
 da8bb080163f8b71f50e579fd5ee06d6c8f27c54   224543:
 b7ead281d04e72e206b7069e7ae219f1e9759572 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/wireless/mwl8k.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 32c57c011c09..92c6fde4186f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae63a33ec9b598b3454cf0d29077fa17b616c42a
+refs/heads/master: a1fe24b0fd8bf16b4e551ae3fb785bfc574b9ffb
diff --git a/trunk/drivers/net/wireless/mwl8k.c b/trunk/drivers/net/wireless/mwl8k.c
index 1bbcd7c1d02a..f152a25be59f 100644
--- a/trunk/drivers/net/wireless/mwl8k.c
+++ b/trunk/drivers/net/wireless/mwl8k.c
@@ -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)
 {
@@ -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);