ath9k: fix AR_RX_FILTER for ar9462/ar9565 when rx stopped (f0b2c30a) · Commits · 戴 / test

When rx stopped, AR_RX_FILTER should be cleared, but in ath9k_hw_setrxfilter(), ATH9K_RX_FILTER_CONTROL_WRAPPER will always be set for ar9462/ar9565. Fix this by moving the code in ath9k_hw_setrxfilter() to ath_calcrxfilter(). Signed-off-by:

Miaoqing Pan <miaoqing@qca.qualcomm.com> Signed-off-by:

Kalle Valo <kvalo@qca.qualcomm.com>

drivers/net/wireless/ath/ath9k/hw.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -2761,9 +2761,6 @@ void ath9k_hw_setrxfilter(struct ath_hw *ah, u32 bits)

		ENABLE_REGWRITE_BUFFER(ah);

		if (AR_SREV_9462(ah) \|\| AR_SREV_9565(ah))
		bits \|= ATH9K_RX_FILTER_CONTROL_WRAPPER;

		REG_WRITE(ah, AR_RX_FILTER, bits);

		phybits = 0;

drivers/net/wireless/ath/ath9k/recv.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -424,6 +424,9 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
		AR_SREV_9561(sc->sc_ah))
		rfilt \|= ATH9K_RX_FILTER_4ADDRESS;

		if (AR_SREV_9462(sc->sc_ah) \|\| AR_SREV_9565(sc->sc_ah))
		rfilt \|= ATH9K_RX_FILTER_CONTROL_WRAPPER;

		if (ath9k_is_chanctx_enabled() &&
		test_bit(ATH_OP_SCANNING, &common->op_flags))
		rfilt \|= ATH9K_RX_FILTER_BEACON;

Admin message