From patchwork Tue Jan 12 12:47:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lennert Buytenhek X-Patchwork-Id: 72373 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0CClp0p011150 for ; Tue, 12 Jan 2010 12:47:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753266Ab0ALMru (ORCPT ); Tue, 12 Jan 2010 07:47:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751545Ab0ALMru (ORCPT ); Tue, 12 Jan 2010 07:47:50 -0500 Received: from fw.wantstofly.org ([80.101.37.227]:58830 "EHLO mail.wantstofly.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753228Ab0ALMrt (ORCPT ); Tue, 12 Jan 2010 07:47:49 -0500 Received: by mail.wantstofly.org (Postfix, from userid 500) id B7BAB18E1FC; Tue, 12 Jan 2010 13:47:47 +0100 (CET) Date: Tue, 12 Jan 2010 13:47:47 +0100 From: Lennert Buytenhek To: linville@tuxdriver.com, linux-wireless@vger.kernel.org Subject: [PATCH 04/17] mwl8k: simplify sequence number assignment Message-ID: <20100112124747.GT1735@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 67ee3da..7d165be 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c @@ -1355,11 +1355,9 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb) mwl8k_vif = MWL8K_VIF(tx_info->control.vif); if (tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) { - u16 seqno = mwl8k_vif->seqno; - wh->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG); - wh->seq_ctrl |= cpu_to_le16(seqno << 4); - mwl8k_vif->seqno = seqno++ % 4096; + wh->seq_ctrl |= cpu_to_le16(mwl8k_vif->seqno); + mwl8k_vif->seqno += 0x10; } /* Setup firmware control bit fields for each frame type. */