From patchwork Mon Nov 30 17:31:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lennert Buytenhek X-Patchwork-Id: 63744 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAUHVkti021428 for ; Mon, 30 Nov 2009 17:31:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752564AbZK3Rbr (ORCPT ); Mon, 30 Nov 2009 12:31:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752660AbZK3Rbr (ORCPT ); Mon, 30 Nov 2009 12:31:47 -0500 Received: from fw.wantstofly.org ([80.101.37.227]:45408 "EHLO mail.wantstofly.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752340AbZK3Rbq (ORCPT ); Mon, 30 Nov 2009 12:31:46 -0500 Received: by mail.wantstofly.org (Postfix, from userid 500) id 27B4118E201; Mon, 30 Nov 2009 18:31:52 +0100 (CET) Date: Mon, 30 Nov 2009 18:31:52 +0100 From: Lennert Buytenhek To: "John W. Linville" , linux-wireless@vger.kernel.org Subject: [PATCH 03/11] mwl8k: get rid of the AMSDU check in the transmit path Message-ID: <20091130173152.GS20214@mail.wantstofly.org> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.4.2.2i Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 43b2d64..9a60381 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c @@ -678,14 +678,6 @@ static inline u16 mwl8k_qos_setbit_ack(u16 qos, u8 ack_policy) return (qos & qos_mask) | ((ack_policy & val_mask) << shift); } -static inline u16 mwl8k_qos_setbit_amsdu(u16 qos) -{ - u16 val_mask = 1 << 7; - - /* AMSDU present Bit 7 */ - return qos | val_mask; -} - static inline u16 mwl8k_qos_setbit_qlen(u16 qos, u8 len) { u16 val_mask = 0xff; @@ -1475,9 +1467,6 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb) else qos = mwl8k_qos_setbit_ack(qos, MWL8K_TXD_ACK_POLICY_NORMAL); - - if (qos & IEEE80211_QOS_CONTROL_A_MSDU_PRESENT) - qos = mwl8k_qos_setbit_amsdu(qos); } dma = pci_map_single(priv->pdev, skb->data,