diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/recv.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index cfaf0a48b939..642504f9638c 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c | |||
@@ -75,7 +75,6 @@ static void ath_rx_buf_link(struct ath_softc *sc, struct ath_buf *bf) | |||
75 | *sc->rx.rxlink = bf->bf_daddr; | 75 | *sc->rx.rxlink = bf->bf_daddr; |
76 | 76 | ||
77 | sc->rx.rxlink = &ds->ds_link; | 77 | sc->rx.rxlink = &ds->ds_link; |
78 | ath9k_hw_rxena(ah); | ||
79 | } | 78 | } |
80 | 79 | ||
81 | static void ath_setdefantenna(struct ath_softc *sc, u32 antenna) | 80 | static void ath_setdefantenna(struct ath_softc *sc, u32 antenna) |
@@ -426,9 +425,7 @@ u32 ath_calcrxfilter(struct ath_softc *sc) | |||
426 | else | 425 | else |
427 | rfilt |= ATH9K_RX_FILTER_BEACON; | 426 | rfilt |= ATH9K_RX_FILTER_BEACON; |
428 | 427 | ||
429 | if ((AR_SREV_9280_20_OR_LATER(sc->sc_ah) || | 428 | if ((sc->sc_ah->opmode == NL80211_IFTYPE_AP) || |
430 | AR_SREV_9285_12_OR_LATER(sc->sc_ah)) && | ||
431 | (sc->sc_ah->opmode == NL80211_IFTYPE_AP) && | ||
432 | (sc->rx.rxfilter & FIF_PSPOLL)) | 429 | (sc->rx.rxfilter & FIF_PSPOLL)) |
433 | rfilt |= ATH9K_RX_FILTER_PSPOLL; | 430 | rfilt |= ATH9K_RX_FILTER_PSPOLL; |
434 | 431 | ||
@@ -1767,6 +1764,7 @@ requeue: | |||
1767 | } else { | 1764 | } else { |
1768 | list_move_tail(&bf->list, &sc->rx.rxbuf); | 1765 | list_move_tail(&bf->list, &sc->rx.rxbuf); |
1769 | ath_rx_buf_link(sc, bf); | 1766 | ath_rx_buf_link(sc, bf); |
1767 | ath9k_hw_rxena(ah); | ||
1770 | } | 1768 | } |
1771 | } while (1); | 1769 | } while (1); |
1772 | 1770 | ||