diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2010-01-12 07:47:47 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-12 14:21:10 -0500 |
commit | 657232b625890f202867ede0ed67ecf15827ff80 (patch) | |
tree | 8ac94a1bbe556687d830d453efd8db98832ea6e3 /drivers/net/wireless/mwl8k.c | |
parent | c97470dd253831e880c72ea5d022ed7f3aee45c3 (diff) |
mwl8k: simplify sequence number assignment
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>
Diffstat (limited to 'drivers/net/wireless/mwl8k.c')
-rw-r--r-- | drivers/net/wireless/mwl8k.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 67ee3da33264..7d165befb0d7 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) | |||
1355 | mwl8k_vif = MWL8K_VIF(tx_info->control.vif); | 1355 | mwl8k_vif = MWL8K_VIF(tx_info->control.vif); |
1356 | 1356 | ||
1357 | if (tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) { | 1357 | if (tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) { |
1358 | u16 seqno = mwl8k_vif->seqno; | ||
1359 | |||
1360 | wh->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG); | 1358 | wh->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG); |
1361 | wh->seq_ctrl |= cpu_to_le16(seqno << 4); | 1359 | wh->seq_ctrl |= cpu_to_le16(mwl8k_vif->seqno); |
1362 | mwl8k_vif->seqno = seqno++ % 4096; | 1360 | mwl8k_vif->seqno += 0x10; |
1363 | } | 1361 | } |
1364 | 1362 | ||
1365 | /* Setup firmware control bit fields for each frame type. */ | 1363 | /* Setup firmware control bit fields for each frame type. */ |