From 78d8c55a3dae24f29011479d9dc77b36fb8c5b23 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 18 Jul 2012 16:36:57 +0200 Subject: [PATCH] --- yaml --- r: 327683 b: refs/heads/master c: ebdfb7a144c53d0b8e771a738f058bc11f0e187f h: refs/heads/master i: 327681: a36bb6bf1adf531b77ee5b95d49c4a0aa8ef3d96 327679: 9dd685fb495fdbf23aef974fab57f7f04898b12a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/dvm/tx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f8354962846e..06aee2085049 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9da987ac2b88b40c327ce08735b0d46057d180d7 +refs/heads/master: ebdfb7a144c53d0b8e771a738f058bc11f0e187f diff --git a/trunk/drivers/net/wireless/iwlwifi/dvm/tx.c b/trunk/drivers/net/wireless/iwlwifi/dvm/tx.c index 5971a23aa47d..954ac34aa390 100644 --- a/trunk/drivers/net/wireless/iwlwifi/dvm/tx.c +++ b/trunk/drivers/net/wireless/iwlwifi/dvm/tx.c @@ -431,7 +431,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) * only. Check this here. */ if (WARN_ONCE(tid_data->agg.state != IWL_AGG_ON && - tid_data->agg.state != IWL_AGG_OFF, + tid_data->agg.state != IWL_AGG_OFF, "Tx while agg.state = %d", tid_data->agg.state)) goto drop_unlock_sta;