]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
carl9170: fix WARN_ON triggered by Broadcom HT STAs
authorChristian Lamparter <chunkeey@googlemail.com>
Sun, 26 Sep 2010 21:06:56 +0000 (23:06 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Sep 2010 19:47:56 +0000 (15:47 -0400)
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>
drivers/net/wireless/ath/carl9170/main.c

index a8b0cec78b3263db0513a0ca5fffd6e50787aaee..84bd38e9961cb62d84a7d25f314c5b72713186eb 100644 (file)
@@ -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();