aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2010-09-26 23:06:56 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-09-28 15:47:56 -0400
commit9c655c8be9053a65886ac3e06420399a9bfdbd70 (patch)
treeda88dbc4b5b3e3e15c004a33aae5a4fc60e55fc4 /drivers/net
parentcarl9170: fix tx_ampdu_upload counter (diff)
downloadlinux-dev-9c655c8be9053a65886ac3e06420399a9bfdbd70.tar.xz
linux-dev-9c655c8be9053a65886ac3e06420399a9bfdbd70.zip
carl9170: fix WARN_ON triggered by Broadcom HT STAs
Broadcom's Windows driver for the 4313 advertises an ampdu density of 7 => 16 us. The AR9170 MAC on the other hand only supports densities up to 8 us. This patch removes the noisy WARN_ON, because there is nothing we can do about it. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath/carl9170/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index a8b0cec78b32..84bd38e9961c 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1248,7 +1248,7 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw,
switch (action) {
case IEEE80211_AMPDU_TX_START:
- if (WARN_ON_ONCE(!sta_info->ht_sta))
+ if (!sta_info->ht_sta)
return -EOPNOTSUPP;
rcu_read_lock();