ath9k: Fix RX Filter handling for BAR
BAR frames have to be sent to mac80211 only if the current channel is HT. Also, move the macro to enum ath9k_rx_filter. Signed-off-by: Sujith <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
fc548af877
commit
7ea310be65
|
@ -3967,7 +3967,8 @@ void ath9k_hw_setrxfilter(struct ath_hw *ah, u32 bits)
|
|||
{
|
||||
u32 phybits;
|
||||
|
||||
REG_WRITE(ah, AR_RX_FILTER, (bits & 0xffff) | AR_RX_COMPR_BAR);
|
||||
REG_WRITE(ah, AR_RX_FILTER, bits);
|
||||
|
||||
phybits = 0;
|
||||
if (bits & ATH9K_RX_FILTER_PHYRADAR)
|
||||
phybits |= AR_PHY_ERR_RADAR;
|
||||
|
|
|
@ -568,6 +568,7 @@ enum ath9k_rx_filter {
|
|||
ATH9K_RX_FILTER_PROBEREQ = 0x00000080,
|
||||
ATH9K_RX_FILTER_PHYERR = 0x00000100,
|
||||
ATH9K_RX_FILTER_MYBEACON = 0x00000200,
|
||||
ATH9K_RX_FILTER_COMP_BAR = 0x00000400,
|
||||
ATH9K_RX_FILTER_PSPOLL = 0x00004000,
|
||||
ATH9K_RX_FILTER_PHYRADAR = 0x00002000,
|
||||
ATH9K_RX_FILTER_MCAST_BCAST_ALL = 0x00008000,
|
||||
|
|
|
@ -2433,7 +2433,7 @@ static void ath9k_configure_filter(struct ieee80211_hw *hw,
|
|||
ath9k_hw_setrxfilter(sc->sc_ah, rfilt);
|
||||
ath9k_ps_restore(sc);
|
||||
|
||||
DPRINTF(sc, ATH_DBG_CONFIG, "Set HW RX filter: 0x%x\n", sc->rx.rxfilter);
|
||||
DPRINTF(sc, ATH_DBG_CONFIG, "Set HW RX filter: 0x%x\n", rfilt);
|
||||
}
|
||||
|
||||
static void ath9k_sta_notify(struct ieee80211_hw *hw,
|
||||
|
|
|
@ -423,6 +423,9 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
|
|||
if (sc->rx.rxfilter & FIF_PSPOLL)
|
||||
rfilt |= ATH9K_RX_FILTER_PSPOLL;
|
||||
|
||||
if (conf_is_ht(&sc->hw->conf))
|
||||
rfilt |= ATH9K_RX_FILTER_COMP_BAR;
|
||||
|
||||
if (sc->sec_wiphy || (sc->rx.rxfilter & FIF_OTHER_BSS)) {
|
||||
/* TODO: only needed if more than one BSSID is in use in
|
||||
* station/adhoc mode */
|
||||
|
|
|
@ -1325,7 +1325,6 @@ enum {
|
|||
#define AR_CFP_VAL 0x0000FFFF
|
||||
|
||||
#define AR_RX_FILTER 0x803C
|
||||
#define AR_RX_COMPR_BAR 0x00000400
|
||||
|
||||
#define AR_MCAST_FIL0 0x8040
|
||||
#define AR_MCAST_FIL1 0x8044
|
||||
|
|
Loading…
Reference in New Issue