ath9k: Fix COMP_BAR filter
authorSujith Manoharan <c_manoha@qca.qualcomm.com>
Fri, 5 Sep 2014 02:33:17 +0000 (08:03 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 9 Sep 2014 19:27:21 +0000 (15:27 -0400)
ATH9K_RX_FILTER_COMP_BAR is used to receive BAR
completion frames and is set if the current channel
is HT. When channel contexts are enabled, instead of using
the mac80211 helpers, check if the current channel
definition is HT.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/recv.c

index 04b02b56076f195b642e3d1f300502e137d3021b..63fbc3eda570a49810f2b12bf38e3281b7f41658 100644 (file)
@@ -412,7 +412,7 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
            (sc->rx.rxfilter & FIF_PSPOLL))
                rfilt |= ATH9K_RX_FILTER_PSPOLL;
 
-       if (conf_is_ht(&sc->hw->conf))
+       if (sc->cur_chandef.width != NL80211_CHAN_WIDTH_20_NOHT)
                rfilt |= ATH9K_RX_FILTER_COMP_BAR;
 
        if (sc->nvifs > 1 || (sc->rx.rxfilter & FIF_OTHER_BSS)) {