diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-20 15:24:57 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-20 15:24:57 -0400 |
| commit | 5470b462c3f0c6fa980c320968a165bd0f34ca8d (patch) | |
| tree | eb20de947bec8133d27f97f7af8ae4cf35def663 /drivers/net/wireless/iwlwifi/pcie/tx.c | |
| parent | 4c1d8d0617a39c8325a7c2fd80ac14bf40fd8cc6 (diff) | |
| parent | 0d4e67174b03e3dcfe75ce7ec488770a5d443bf4 (diff) | |
| download | linux-5470b462c3f0c6fa980c320968a165bd0f34ca8d.tar.gz linux-5470b462c3f0c6fa980c320968a165bd0f34ca8d.tar.bz2 linux-5470b462c3f0c6fa980c320968a165bd0f34ca8d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/tx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/tx.c | 2 |
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 7a508d835f5a..005e2cfb2f41 100644 --- a/drivers/net/wireless/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/iwlwifi/pcie/tx.c @@ -1607,7 +1607,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, * Check here that the packets are in the right place on the ring. */ #ifdef CONFIG_IWLWIFI_DEBUG - wifi_seq = SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl)); + wifi_seq = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl)); WARN_ONCE((iwl_read_prph(trans, SCD_AGGR_SEL) & BIT(txq_id)) && ((wifi_seq & 0xff) != q->write_ptr), "Q: %d WiFi Seq %d tfdNum %d", |