From 0cbfff7cf69db058e45ffb611e304ad926632e47 Mon Sep 17 00:00:00 2001 From: Don Fry Date: Sat, 23 Oct 2010 09:02:50 -0700 Subject: [PATCH] --- yaml --- r: 218443 b: refs/heads/master c: 822395b591db32ad3cf8a5b57b0fe30fb8d12c37 h: refs/heads/master i: 218441: 25420fd30ba00aab3244df487cc14c937a1afe96 218439: ea43fd4cb2fed0862eef519d99d0ec8da80553b0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fcf5b791472f..9bfe593132a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fac6b6a065da42f826088c58bddad82e1b1ccb40 +refs/heads/master: 822395b591db32ad3cf8a5b57b0fe30fb8d12c37 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c index db57aea629d9..2b078a995729 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c @@ -1227,7 +1227,8 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv, struct ieee80211_tx_info *info; if (unlikely(!agg->wait_for_ba)) { - IWL_ERR(priv, "Received BA when not expected\n"); + if (unlikely(ba_resp->bitmap)) + IWL_ERR(priv, "Received BA when not expected\n"); return -EINVAL; }