From 8b90d3a4f0e37d1617b52952d1c73134818a2a7a Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Mon, 10 Oct 2011 07:27:03 -0700 Subject: [PATCH] --- yaml --- r: 266741 b: refs/heads/master c: 9e8107ed9058e910eee982ee94d3a5eb201fb5d1 h: refs/heads/master i: 266739: 8edb7b2e0f35fd88f822c392369dcb3b93e91c17 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0e27c99f1845..3c198edac152 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 984ecb9293b77901947f3ade5f7e1a70bfc7d940 +refs/heads/master: 9e8107ed9058e910eee982ee94d3a5eb201fb5d1 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c index f69aecb554e9..2abd07ff96c2 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c @@ -1098,7 +1098,7 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, seq_number += 0x10; /* aggregation is on for this */ if (info->flags & IEEE80211_TX_CTL_AMPDU) { - WARN_ON(tid_data->agg.state != IWL_AGG_ON); + WARN_ON_ONCE(tid_data->agg.state != IWL_AGG_ON); txq_id = tid_data->agg.txq_id; is_agg = true; }