diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-03-20 09:30:42 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-20 09:30:42 -0400 |
| commit | fc8fed0eae4c2d1756ffd2f4f86c3e4357bebb08 (patch) | |
| tree | 0b0d53c6976925edfb4f33d73fdfd3022f938b29 /drivers/net/wireless/iwlwifi/pcie | |
| parent | c451e6d4bd290db5290cfa7f9c4079386373645b (diff) | |
| parent | 856a850afdd778fad7ded4240d333a8c3b05b136 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie')
| -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 b29034d9c963..a4508c2fa92b 100644 --- a/drivers/net/wireless/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/iwlwifi/pcie/tx.c | |||
| @@ -1612,7 +1612,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, | |||
| 1612 | * Check here that the packets are in the right place on the ring. | 1612 | * Check here that the packets are in the right place on the ring. |
| 1613 | */ | 1613 | */ |
| 1614 | #ifdef CONFIG_IWLWIFI_DEBUG | 1614 | #ifdef CONFIG_IWLWIFI_DEBUG |
| 1615 | wifi_seq = SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl)); | 1615 | wifi_seq = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl)); |
| 1616 | WARN_ONCE((iwl_read_prph(trans, SCD_AGGR_SEL) & BIT(txq_id)) && | 1616 | WARN_ONCE((iwl_read_prph(trans, SCD_AGGR_SEL) & BIT(txq_id)) && |
| 1617 | ((wifi_seq & 0xff) != q->write_ptr), | 1617 | ((wifi_seq & 0xff) != q->write_ptr), |
| 1618 | "Q: %d WiFi Seq %d tfdNum %d", | 1618 | "Q: %d WiFi Seq %d tfdNum %d", |