aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/pcie
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-15 13:25:00 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-03-06 10:35:44 -0500
commit9a886586c82aa02cb49f8c85e961595716884545 (patch)
tree915cc9035a0172d93a421025ba1e8bdf871a1502 /drivers/net/wireless/iwlwifi/pcie
parentb56cf720833c4a9d7e6ed96cc9f5c1a1091ff3bc (diff)
wireless: move sequence number arithmetic to ieee80211.h
Move the sequence number arithmetic code from mac80211 to ieee80211.h so others can use it. Also rename the functions from _seq to _sn, they operate on the sequence number, not the sequence_control field. Also move macros to convert the sequence control to/from the sequence number value from various drivers. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie')
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/tx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index 8e9e3212fe78..ad7441dfa6fb 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -1581,7 +1581,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
1581 * Check here that the packets are in the right place on the ring. 1581 * Check here that the packets are in the right place on the ring.
1582 */ 1582 */
1583#ifdef CONFIG_IWLWIFI_DEBUG 1583#ifdef CONFIG_IWLWIFI_DEBUG
1584 wifi_seq = SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl)); 1584 wifi_seq = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
1585 WARN_ONCE((iwl_read_prph(trans, SCD_AGGR_SEL) & BIT(txq_id)) && 1585 WARN_ONCE((iwl_read_prph(trans, SCD_AGGR_SEL) & BIT(txq_id)) &&
1586 ((wifi_seq & 0xff) != q->write_ptr), 1586 ((wifi_seq & 0xff) != q->write_ptr),
1587 "Q: %d WiFi Seq %d tfdNum %d", 1587 "Q: %d WiFi Seq %d tfdNum %d",