ath9k: Use probe interval instead of rssi reduce interval

Get rid of rssi reduce interval.

Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 731967c74a156efd4b3397fe5b9154c55bc09298..a97dd7b6b706ae8fd2a7c8aebf0c9d8a193dfcda 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -148,7 +148,6 @@ static const struct ath_rate_table ar5416_11na_ratetable = {
                        4,  23, 40, 41, 41, 148400 },
        },
        50,  /* probe interval */
-       50,  /* rssi reduce interval */
        WLAN_RC_HT_FLAG,  /* Phy rates allowed initially */
 };
 
@@ -298,7 +297,6 @@ static const struct ath_rate_table ar5416_11ng_ratetable = {
                        8,  27, 44, 45, 45, 148400 },
                },
        50,  /* probe interval */
-       50,  /* rssi reduce interval */
        WLAN_RC_HT_FLAG,  /* Phy rates allowed initially */
 };
 
@@ -331,7 +329,6 @@ static const struct ath_rate_table ar5416_11a_ratetable = {
                        4,  7, 0 },
        },
        50,  /* probe interval */
-       50,  /* rssi reduce interval */
        0,   /* Phy rates allowed initially */
 };
 
@@ -376,7 +373,6 @@ static const struct ath_rate_table ar5416_11g_ratetable = {
                        8,  11, 0 },
        },
        50,  /* probe interval */
-       50,  /* rssi reduce interval */
        0,   /* Phy rates allowed initially */
 };
 
@@ -1070,7 +1066,7 @@ static void ath_rc_update_ht(struct ath_softc *sc,
        /* Every so often, we reduce the thresholds
         * and PER (different for CCK and OFDM). */
        if (now_msec - ath_rc_priv->per_down_time >=
-           rate_table->rssi_reduce_interval) {
+           rate_table->probe_interval) {
                for (rate = 0; rate < size; rate++) {
                        ath_rc_priv->state[rate].per =
                                7 * ath_rc_priv->state[rate].per / 8;

diff --git a/drivers/net/wireless/ath/ath9k/rc.h b/drivers/net/wireless/ath/ath9k/rc.h
index 6797df0b196df5ddbcd59baea842669386c13677..c794d6c82ad4a478110a49e90f109403f05783bb 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/rc.h
+++ b/drivers/net/wireless/ath/ath9k/rc.h
@@ -119,7 +119,6 @@ struct ath_rate_table {
                u32 max_4ms_framelen;
        } info[RATE_TABLE_SIZE];
        u32 probe_interval;
-       u32 rssi_reduce_interval;
        u8 initial_ratemax;
 };