mwl8k: simplify sequence number assignment
authorLennert Buytenhek <buytenh@wantstofly.org>
Tue, 12 Jan 2010 12:47:47 +0000 (13:47 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Jan 2010 19:21:10 +0000 (14:21 -0500)
By storing the sequence counter in << 4 format, like other drivers do.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/mwl8k.c

index 67ee3da3326470a5d1d75e83d3d4df9a19f38a2a..7d165befb0d7e07cf08e348786eca986ec2b40cf 100644 (file)
@@ -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.  */