Merge ath-next from ath.git

[cascardo/linux.git] / drivers / net / wireless / ath / ath9k / hw.c

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index bdfff46..257f46e 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -385,7 +385,7 @@ static void ath9k_hw_init_config(struct ath_hw *ah)
 
        ah->config.dma_beacon_response_time = 1;
        ah->config.sw_beacon_response_time = 6;
-       ah->config.cwm_ignore_extcca = 0;
+       ah->config.cwm_ignore_extcca = false;
        ah->config.analog_shiftreg = 1;
 
        ah->config.rx_intr_mitigation = true;
@@ -2299,10 +2299,10 @@ void ath9k_hw_set_sta_beacon_timers(struct ath_hw *ah,
        else
                nextTbtt = bs->bs_nexttbtt;
 
-       ath_dbg(common, BEACON, "next DTIM %d\n", bs->bs_nextdtim);
-       ath_dbg(common, BEACON, "next beacon %d\n", nextTbtt);
-       ath_dbg(common, BEACON, "beacon period %d\n", beaconintval);
-       ath_dbg(common, BEACON, "DTIM period %d\n", dtimperiod);
+       ath_dbg(common, BEACON, "next DTIM %u\n", bs->bs_nextdtim);
+       ath_dbg(common, BEACON, "next beacon %u\n", nextTbtt);
+       ath_dbg(common, BEACON, "beacon period %u\n", beaconintval);
+       ath_dbg(common, BEACON, "DTIM period %u\n", dtimperiod);
 
        ENABLE_REGWRITE_BUFFER(ah);
 
@@ -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;