diff options
author | Johannes Berg | 2013-03-20 14:30:42 +0100 |
---|---|---|
committer | Johannes Berg | 2013-03-20 14:30:42 +0100 |
commit | fc8fed0eae4c2d1756ffd2f4f86c3e4357bebb08 (patch) | |
tree | 0b0d53c6976925edfb4f33d73fdfd3022f938b29 /drivers/net/wireless/iwlwifi/mvm/tx.c | |
parent | iwlwifi: mvm: Increase the max remain on channel time (diff) | |
parent | rt2800: 5592: add more USB devices IDs (diff) | |
download | kernel-qcow2-linux-fc8fed0eae4c2d1756ffd2f4f86c3e4357bebb08.tar.gz kernel-qcow2-linux-fc8fed0eae4c2d1756ffd2f4f86c3e4357bebb08.tar.xz kernel-qcow2-linux-fc8fed0eae4c2d1756ffd2f4f86c3e4357bebb08.zip |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/tx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c index ccff2e5f71a6..0acc0bff43c7 100644 --- a/drivers/net/wireless/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/iwlwifi/mvm/tx.c @@ -637,7 +637,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm, next_reclaimed = ssn; } else { /* The next packet to be reclaimed is the one after this one */ - next_reclaimed = SEQ_TO_SN(seq_ctl + 0x10); + next_reclaimed = IEEE80211_SEQ_TO_SN(seq_ctl + 0x10); } IWL_DEBUG_TX_REPLY(mvm, |