From patchwork Sat Nov 13 01:23:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cavagnolo X-Patchwork-Id: 321832 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAD1OG3H005975 for ; Sat, 13 Nov 2010 01:24:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757654Ab0KMBYP (ORCPT ); Fri, 12 Nov 2010 20:24:15 -0500 Received: from mail-yw0-f46.google.com ([209.85.213.46]:55148 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754013Ab0KMBYO (ORCPT ); Fri, 12 Nov 2010 20:24:14 -0500 Received: by ywc21 with SMTP id 21so947866ywc.19 for ; Fri, 12 Nov 2010 17:24:13 -0800 (PST) Received: by 10.151.9.20 with SMTP id m20mr389781ybi.175.1289611453676; Fri, 12 Nov 2010 17:24:13 -0800 (PST) Received: from localhost.localdomain (adsl-99-114-136-65.dsl.pltn13.sbcglobal.net [99.114.136.65]) by mx.google.com with ESMTPS id q31sm556068yba.6.2010.11.12.17.24.11 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 12 Nov 2010 17:24:12 -0800 (PST) From: Brian Cavagnolo To: linux-wireless@vger.kernel.org Cc: buytenh@wantstofly.org, Brian Cavagnolo Subject: [PATCH V2 1/7] mwl8k: revert unnecessary modification of tx descriptor Date: Fri, 12 Nov 2010 17:23:47 -0800 Message-Id: <1289611433-5119-2-git-send-email-brian@cozybit.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1288659351-22313-1-git-send-email-brian@cozybit.com> References: <1288659351-22313-1-git-send-email-brian@cozybit.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 13 Nov 2010 01:24:17 +0000 (UTC) diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 1bbcd7c..f152a25 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/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);