From 5195ca3e446867b86cb74664bc6923f4b35357b3 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 16 Nov 2010 11:51:04 -0800 Subject: [PATCH] --- yaml --- r: 224839 b: refs/heads/master c: 67158b67cea0c92dba1dda74cde926d149cc1a2e h: refs/heads/master i: 224837: 861b61a6bdd808a13ebe352d0eaee7d1f79fc76e 224835: 687f0b3489e62e14bd94cef55cb179515c3e26c0 224831: 539e64f59ce848f68ad4e7bc11a87a5016b52d67 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e379ef046915..38ddcdf1fee5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbbf1755b09eef8ff6dd21c8dafe1606f051ce12 +refs/heads/master: 67158b67cea0c92dba1dda74cde926d149cc1a2e diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c index 07bbc915529a..e8bd0b311946 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-tx.c @@ -567,8 +567,8 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) if (sta) sta_priv = (void *)sta->drv_priv; - if (sta_priv && sta_priv->asleep) { - WARN_ON(!(info->flags & IEEE80211_TX_CTL_PSPOLL_RESPONSE)); + if (sta_priv && sta_priv->asleep && + (info->flags & IEEE80211_TX_CTL_PSPOLL_RESPONSE)) { /* * This sends an asynchronous command to the device, * but we can rely on it being processed before the