ath9k: make rate control debugfs stats per station
PATCH 1/3 ath9k: make rate control debugfs stats per station
Move them to the same debugfs file that the other rc modules use.
--- drivers/net/wireless/ath/ath9k/debug.c | 93 -------------------------- drivers/net/wireless/ath/ath9k/debug.h | 21 ------ drivers/net/wireless/ath/ath9k/rc.c | 115 +++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath9k/rc.h | 11 +++ 4 files changed, 124 insertions(+), 116 deletions(-)
drivers/net/wireless/ath/ath9k/debug.c +0 -93
@@ -378,95 +378,6 @@ static const struct file_operations fops_interrupt = { .owner = THIS_MODULE }; -void ath_debug_stat_rc (struct ath_softc *sc,int final_rate) -{ -struct ath_rc_stats *stats; - - stats = &sc->debug.stats.rcstats[final_rate]; - stats->success++; -} - -void ath_debug_stat_retries (struct ath_softc *sc,int rix, -int xretries,int retries,u8 per) -{ -struct ath_rc_stats *stats = &sc->debug.stats.rcstats[rix]; - - stats->xretries += xretries; - stats->retries += retries; - stats->per = per; -} - -static ssize_t read_file_rcstat (struct file *file,char __user *user_buf, -size_t count,loff_t *ppos) -{ -struct ath_softc *sc = file->private_data; -char *buf; -unsigned int len =0 , max; -int i =0 ; -ssize_t retval; - -if (sc->cur_rate_table ==NULL ) -return 0 ; - - max =80 + sc->cur_rate_table->rate_cnt *1024 +1 ; - buf =kmalloc (max,GFP_KERNEL ); -if (buf ==NULL ) -return -ENOMEM ; - - len +=sprintf (buf,"%6s %6s %6s " -"%10s %10s %10s %10s\n" , -"HT" ,"MCS" ,"Rate" , -"Success" ,"Retries" ,"XRetries" ,"PER" ); - -for (i =0 ; i < sc->cur_rate_table->rate_cnt; i++) { -u32 ratekbps = sc->cur_rate_table->info[i].ratekbps; -struct ath_rc_stats *stats = &sc->debug.stats.rcstats[i]; -char mcs[5 ]; -char htmode[5 ]; -int used_mcs =0 , used_htmode =0 ; - -if (WLAN_RC_PHY_HT (sc->cur_rate_table->info[i].phy)) { - used_mcs =snprintf (mcs,5 ,"%d" , - sc->cur_rate_table->info[i].ratecode); - -if (WLAN_RC_PHY_40 (sc->cur_rate_table->info[i].phy)) - used_htmode =snprintf (htmode,5 ,"HT40" ); -else if (WLAN_RC_PHY_20 (sc->cur_rate_table->info[i].phy)) - used_htmode =snprintf (htmode,5 ,"HT20" ); -else - used_htmode =snprintf (htmode,5 ,"????" ); - } - - mcs[used_mcs] ='\0' ; - htmode[used_htmode] ='\0' ; - - len +=snprintf (buf + len, max - len, -"%6s %6s %3u.%d: " -"%10u %10u %10u %10u\n" , - htmode, - mcs, - ratekbps /1000 , - (ratekbps %1000 ) /100 , - stats->success, - stats->retries, - stats->xretries, - stats->per); - } - -if (len > max) - len = max; - - retval =simple_read_from_buffer (user_buf, count, ppos, buf, len); -kfree (buf); -return retval; -} - -static const struct file_operations fops_rcstat = { - .read = read_file_rcstat, - .open = ath9k_debugfs_open, - .owner =THIS_MODULE -}; -static const char *ath_wiphy_state_str (enum ath_wiphy_state state) {switch (state) {
@@ -977,10 +888,6 @@ int ath9k_init_debug(struct ath_hw *ah) sc, &fops_interrupt)) goto err; -if (!debugfs_create_file ("rcstat" ,S_IRUSR , sc->debug.debugfs_phy, - sc, &fops_rcstat)) - goto err; -if (!debugfs_create_file ("wiphy" ,S_IRUSR |S_IWUSR , sc->debug.debugfs_phy, sc, &fops_wiphy)) goto err;
drivers/net/wireless/ath/ath9k/debug.h +0 -21
@@ -80,13 +80,6 @@ struct ath_interrupt_stats {u32 bb_watchdog; }; -struct ath_rc_stats { -u32 success; -u32 retries; -u32 xretries; -u8 per; -}; -/** * struct ath_tx_stats - Statistics about TX * @tx_pkts_all: No. of total frames transmitted, including ones that
@@ -160,7 +153,6 @@ struct ath_rx_stats {struct ath_stats {struct ath_interrupt_stats istats; -struct ath_rc_stats rcstats[RATE_TABLE_SIZE ];struct ath_tx_stats txstats[ATH9K_NUM_TX_QUEUES ];struct ath_rx_stats rxstats; };
@@ -177,12 +169,9 @@ void ath9k_exit_debug(struct ath_hw *ah);int ath9k_debug_create_root (void );void ath9k_debug_remove_root (void );void ath_debug_stat_interrupt (struct ath_softc *sc,enum ath9k_int status); -void ath_debug_stat_rc (struct ath_softc *sc,int final_rate);void ath_debug_stat_tx (struct ath_softc *sc,struct ath_txq *txq,struct ath_buf *bf,struct ath_tx_status *ts);void ath_debug_stat_rx (struct ath_softc *sc,struct ath_rx_status *rs); -void ath_debug_stat_retries (struct ath_softc *sc,int rix, -int xretries,int retries,u8 per);#else
@@ -209,11 +198,6 @@ static inline void ath_debug_stat_interrupt(struct ath_softc *sc, { } -static inline void ath_debug_stat_rc (struct ath_softc *sc, -int final_rate) -{ -} - static inline void ath_debug_stat_tx(struct ath_softc *sc, struct ath_txq *txq, struct ath_buf *bf,
@@ -226,11 +210,6 @@ static inline void ath_debug_stat_rx(struct ath_softc *sc, { } -static inline void ath_debug_stat_retries (struct ath_softc *sc,int rix, -int xretries,int retries,u8 per) -{ -} -#endif /* CONFIG_ATH9K_DEBUGFS */ #endif /* DEBUG_H */
drivers/net/wireless/ath/ath9k/rc.c +113 -2
157 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/rc.h +11 -0
@@ -175,6 +175,13 @@ struct ath_rateset {u8 rs_rates[ATH_RATE_MAX ]; }; +struct ath_rc_stats { +u32 success; +u32 retries; +u32 xretries; +u8 per; +}; +/** * struct ath_rate_priv - Rate Control priv data * @state: RC state
@@ -211,6 +218,10 @@ struct ath_rate_priv {struct ath_rateset neg_rates;struct ath_rateset neg_ht_rates;struct ath_rate_softc *asc; +const struct ath_rate_table *rate_table; + +struct dentry *debugfs_rcstats; +struct ath_rc_stats rcstats[RATE_TABLE_SIZE ]; };#define ATH_TX_INFO_FRAME_TYPE_INTERNAL (1 << 0)
Signature · 1 line
1.7.2.2
PATCH 2/3 ath9k: remove sc->cur_rate_table and sc->cur_rate_mode
Set the rate table in the rc module properly based on band and HT capabilities instead, which was already partially done, but not for every mode.
--- drivers/net/wireless/ath/ath9k/ath9k.h | 2 - drivers/net/wireless/ath/ath9k/main.c | 35 -------------------------------- drivers/net/wireless/ath/ath9k/rc.c | 24 +++++++-------------- 3 files changed, 8 insertions(+), 53 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +0 -2
@@ -623,8 +623,6 @@ struct ath_softc {struct ath_rx rx;struct ath_tx tx;struct ath_beacon beacon; -const struct ath_rate_table *cur_rate_table; -enum wireless_mode cur_rate_mode;struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS ];struct ath_led radio_led;
drivers/net/wireless/ath/ath9k/main.c +0 -35
@@ -18,36 +18,6 @@#include "ath9k.h" #include "btcoex.h" -static void ath_cache_conf_rate (struct ath_softc *sc, -struct ieee80211_conf *conf) -{ -switch (conf->channel->band) { -case IEEE80211_BAND_2GHZ : -if (conf_is_ht20 (conf)) - sc->cur_rate_mode =ATH9K_MODE_11NG_HT20 ; -else if (conf_is_ht40_minus (conf)) - sc->cur_rate_mode =ATH9K_MODE_11NG_HT40MINUS ; -else if (conf_is_ht40_plus (conf)) - sc->cur_rate_mode =ATH9K_MODE_11NG_HT40PLUS ; -else - sc->cur_rate_mode =ATH9K_MODE_11G ; -break ; -case IEEE80211_BAND_5GHZ : -if (conf_is_ht20 (conf)) - sc->cur_rate_mode =ATH9K_MODE_11NA_HT20 ; -else if (conf_is_ht40_minus (conf)) - sc->cur_rate_mode =ATH9K_MODE_11NA_HT40MINUS ; -else if (conf_is_ht40_plus (conf)) - sc->cur_rate_mode =ATH9K_MODE_11NA_HT40PLUS ; -else - sc->cur_rate_mode =ATH9K_MODE_11A ; -break ; -default : -BUG_ON (1 ); -break ; - } -} -static void ath_update_txpow (struct ath_softc *sc) {struct ath_hw *ah = sc->sc_ah;
@@ -289,7 +259,6 @@ int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw, goto ps_restore; } -ath_cache_conf_rate (sc, &hw->conf);ath_update_txpow (sc);ath9k_hw_set_interrupts (ah, ah->imask);
@@ -996,8 +965,6 @@ int ath_reset(struct ath_softc *sc, bool retry_tx)* that changes the channel so update any state that * might change as a result. */ -ath_cache_conf_rate (sc, &hw->conf); -ath_update_txpow (sc);if ((sc->sc_flags &SC_OP_BEACONS ) || !(sc->sc_flags & (SC_OP_OFFCHANNEL )))
@@ -1204,8 +1171,6 @@ static int ath9k_start(struct ieee80211_hw *hw)if (ah->caps.hw_caps &ATH9K_HW_CAP_HT ) ah->imask |=ATH9K_INT_CST ; -ath_cache_conf_rate (sc, &hw->conf); - sc->sc_flags &= ~SC_OP_INVALID ;/* Disable BMISS interrupt when we're not associated */
drivers/net/wireless/ath/ath9k/rc.c +8 -16
@@ -791,7 +791,7 @@ static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,*/ try_per_rate =4 ; - rate_table = sc->cur_rate_table; + rate_table = ath_rc_priv->rate_table; rix =ath_rc_get_highest_rix (sc, ath_rc_priv, rate_table, &is_probe);/*
@@ -1048,7 +1048,7 @@ static void ath_rc_update_ht(struct ath_softc *sc,int rate;u8 last_per;bool state_change = false; -const struct ath_rate_table *rate_table = sc->cur_rate_table; +const struct ath_rate_table *rate_table = ath_rc_priv->rate_table;int size = ath_rc_priv->rate_table_size;if ((tx_rate <0 ) || (tx_rate > rate_table->rate_cnt))
@@ -1150,7 +1150,7 @@ static void ath_rc_tx_status(struct ath_softc *sc,u8 flags;u32 i =0 , rix; - rate_table = sc->cur_rate_table; + rate_table = ath_rc_priv->rate_table;/* * If the first rate is not the final index, there
@@ -1231,7 +1231,6 @@ struct ath_rate_table *ath_choose_rate_table(struct ath_softc *sc,ath_print (common,ATH_DBG_CONFIG ,"Choosing rate table for mode: %d\n" , mode); - sc->cur_rate_mode = mode;return hw_rate_table[mode]; }
@@ -1303,7 +1302,6 @@ static void ath_rc_init(struct ath_softc *sc, ath_rc_priv->max_valid_rate = k;ath_rc_sort_validrates (rate_table, ath_rc_priv); ath_rc_priv->rate_max_phy = ath_rc_priv->valid_rate_index[k-4 ]; - sc->cur_rate_table = rate_table; ath_rc_priv->rate_table = rate_table; ath_print(common, ATH_DBG_CONFIG,
@@ -1439,8 +1437,9 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband, } } -ath_debug_stat_rc (ath_rc_priv,ath_rc_get_rateindex (sc->cur_rate_table, - &tx_info->status.rates[final_ts_idx])); +ath_debug_stat_rc (ath_rc_priv, +ath_rc_get_rateindex (ath_rc_priv->rate_table, + &tx_info->status.rates[final_ts_idx])); } static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,
@@ -1480,14 +1479,8 @@ static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,/* Choose rate table first */ -if ((sc->sc_ah->opmode ==NL80211_IFTYPE_STATION ) || - (sc->sc_ah->opmode ==NL80211_IFTYPE_MESH_POINT ) || - (sc->sc_ah->opmode ==NL80211_IFTYPE_ADHOC )) { - rate_table =ath_choose_rate_table (sc, sband->band, - sta->ht_cap.ht_supported, is_cw40); - }else { - rate_table = hw_rate_table[sc->cur_rate_mode]; - } + rate_table =ath_choose_rate_table (sc, sband->band, + sta->ht_cap.ht_supported, is_cw40); ath_rc_priv->ht_cap =ath_rc_build_ht_caps (sc, sta, is_cw40, is_sgi);ath_rc_init (sc, priv_sta, sband, sta, rate_table);
@@ -1536,7 +1529,6 @@ static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband,ath_print (ath9k_hw_common (sc->sc_ah),ATH_DBG_CONFIG ,"Operating HT Bandwidth changed to: %d\n" , sc->hw->conf.channel_type); - sc->cur_rate_table = hw_rate_table[sc->cur_rate_mode]; } } }
Signature · 1 line
1.7.2.2
PATCH 3/3 ath9k_hw: remove enum wireless_mode and its users
The wireless mode bitfield was only used to detect 2.4 and 5 GHz support, which can be simplified by using ATH9K_HW_CAP_* capabilities.
--- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 12 ++++---- drivers/net/wireless/ath/ath9k/hw.c | 34 +++---------------------- drivers/net/wireless/ath/ath9k/hw.h | 15 +--------- drivers/net/wireless/ath/ath9k/init.c | 12 ++++---- drivers/net/wireless/ath/ath9k/rc.c | 33 +++--------------------- 5 files changed, 22 insertions(+), 84 deletions(-)
drivers/net/wireless/ath/ath9k/htc_drv_init.c +6 -6
@@ -566,7 +566,7 @@ static void ath9k_init_crypto(struct ath9k_htc_priv *priv)static void ath9k_init_channels_rates (struct ath9k_htc_priv *priv) { -if (test_bit (ATH9K_MODE_11G , priv->ah->caps.wireless_modes)) { +if (priv->ah->caps.hw_caps &ATH9K_HW_CAP_2GHZ ) { priv->sbands[IEEE80211_BAND_2GHZ ].channels = ath9k_2ghz_channels; priv->sbands[IEEE80211_BAND_2GHZ ].band =IEEE80211_BAND_2GHZ ;
@@ -577,7 +577,7 @@ static void ath9k_init_channels_rates(struct ath9k_htc_priv *priv)ARRAY_SIZE (ath9k_legacy_rates); } -if (test_bit (ATH9K_MODE_11A , priv->ah->caps.wireless_modes)) { +if (priv->ah->caps.hw_caps &ATH9K_HW_CAP_5GHZ ) { priv->sbands[IEEE80211_BAND_5GHZ ].channels = ath9k_5ghz_channels; priv->sbands[IEEE80211_BAND_5GHZ ].band =IEEE80211_BAND_5GHZ ; priv->sbands[IEEE80211_BAND_5GHZ].n_channels =
@@ -740,18 +740,18 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv, hw->extra_tx_headroom =sizeof (struct tx_frame_hdr ) +sizeof (struct htc_frame_hdr ) +4 ; -if (test_bit (ATH9K_MODE_11G , priv->ah->caps.wireless_modes)) +if (priv->ah->caps.hw_caps &ATH9K_HW_CAP_2GHZ ) hw->wiphy->bands[IEEE80211_BAND_2GHZ ] = &priv->sbands[IEEE80211_BAND_2GHZ ]; -if (test_bit (ATH9K_MODE_11A , priv->ah->caps.wireless_modes)) +if (priv->ah->caps.hw_caps &ATH9K_HW_CAP_5GHZ ) hw->wiphy->bands[IEEE80211_BAND_5GHZ ] = &priv->sbands[IEEE80211_BAND_5GHZ ];if (priv->ah->caps.hw_caps &ATH9K_HW_CAP_HT ) { -if (test_bit (ATH9K_MODE_11G , priv->ah->caps.wireless_modes)) +if (priv->ah->caps.hw_caps &ATH9K_HW_CAP_2GHZ )setup_ht_cap (priv, &priv->sbands[IEEE80211_BAND_2GHZ ].ht_cap); -if (test_bit (ATH9K_MODE_11A , priv->ah->caps.wireless_modes)) +if (priv->ah->caps.hw_caps &ATH9K_HW_CAP_5GHZ )setup_ht_cap (priv, &priv->sbands[IEEE80211_BAND_5GHZ ].ht_cap); }
drivers/net/wireless/ath/ath9k/hw.c +4 -30
@@ -1800,37 +1800,11 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)return -EINVAL ; } -bitmap_zero (pCap->wireless_modes,ATH9K_MODE_MAX ); - -if (eeval &AR5416_OPFLAGS_11A ) { -set_bit (ATH9K_MODE_11A , pCap->wireless_modes); -if (ah->config.ht_enable) { -if (!(eeval &AR5416_OPFLAGS_N_5G_HT20 )) -set_bit (ATH9K_MODE_11NA_HT20 , - pCap->wireless_modes); -if (!(eeval &AR5416_OPFLAGS_N_5G_HT40 )) { -set_bit (ATH9K_MODE_11NA_HT40PLUS , - pCap->wireless_modes); -set_bit (ATH9K_MODE_11NA_HT40MINUS , - pCap->wireless_modes); - } - } - } +if (eeval &AR5416_OPFLAGS_11A ) + pCap->hw_caps |=ATH9K_HW_CAP_5GHZ ; -if (eeval &AR5416_OPFLAGS_11G ) { -set_bit (ATH9K_MODE_11G , pCap->wireless_modes); -if (ah->config.ht_enable) { -if (!(eeval &AR5416_OPFLAGS_N_2G_HT20 )) -set_bit (ATH9K_MODE_11NG_HT20 , - pCap->wireless_modes); -if (!(eeval &AR5416_OPFLAGS_N_2G_HT40 )) { -set_bit (ATH9K_MODE_11NG_HT40PLUS , - pCap->wireless_modes); -set_bit (ATH9K_MODE_11NG_HT40MINUS , - pCap->wireless_modes); - } - } - } +if (eeval &AR5416_OPFLAGS_11G ) + pCap->hw_caps |=ATH9K_HW_CAP_2GHZ ; pCap->tx_chainmask = ah->eep_ops->get_eeprom (ah,EEP_TX_MASK );/*
drivers/net/wireless/ath/ath9k/hw.h +2 -13
@@ -164,18 +164,6 @@ enum ath_ini_subsys { ATH_INI_NUM_SPLIT, }; -enum wireless_mode { -ATH9K_MODE_11A =0 , -ATH9K_MODE_11G , -ATH9K_MODE_11NA_HT20 , -ATH9K_MODE_11NG_HT20 , -ATH9K_MODE_11NA_HT40PLUS , -ATH9K_MODE_11NA_HT40MINUS , -ATH9K_MODE_11NG_HT40PLUS , -ATH9K_MODE_11NG_HT40MINUS , -ATH9K_MODE_MAX , -}; -enum ath9k_hw_caps {ATH9K_HW_CAP_HT =BIT (0 ),ATH9K_HW_CAP_RFSILENT =BIT (1 ),
@@ -190,11 +178,12 @@ enum ath9k_hw_caps {ATH9K_HW_CAP_SGI_20 =BIT (10 ),ATH9K_HW_CAP_PAPRD =BIT (11 ),ATH9K_HW_CAP_ANT_DIV_COMB =BIT (12 ), +ATH9K_HW_CAP_2GHZ =BIT (13 ), + ATH9K_HW_CAP_5GHZ = BIT(14), };struct ath9k_hw_capabilities {u32 hw_caps;/* ATH9K_HW_CAP_* from ath9k_hw_caps */ - DECLARE_BITMAP(wireless_modes, ATH9K_MODE_MAX); /* ATH9K_MODE_* */u16 total_queues;u16 keycache_size;u16 low_5ghz_chan, high_5ghz_chan;
drivers/net/wireless/ath/ath9k/init.c +6 -6
@@ -485,7 +485,7 @@ static int ath9k_init_channels_rates(struct ath_softc *sc)ARRAY_SIZE (ath9k_5ghz_chantable) != ATH9K_NUM_CHANNELS); -if (test_bit (ATH9K_MODE_11G , sc->sc_ah->caps.wireless_modes)) { +if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_2GHZ ) { channels =kmemdup (ath9k_2ghz_chantable,sizeof (ath9k_2ghz_chantable),GFP_KERNEL );if (!channels)
@@ -500,7 +500,7 @@ static int ath9k_init_channels_rates(struct ath_softc *sc)ARRAY_SIZE (ath9k_legacy_rates); } -if (test_bit (ATH9K_MODE_11A , sc->sc_ah->caps.wireless_modes)) { +if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_5GHZ ) { channels =kmemdup (ath9k_5ghz_chantable,sizeof (ath9k_5ghz_chantable),GFP_KERNEL );if (!channels) {
@@ -681,17 +681,17 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) hw->rate_control_algorithm ="ath9k_rate_control" ;#endif -if (test_bit (ATH9K_MODE_11G , sc->sc_ah->caps.wireless_modes)) +if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_2GHZ ) hw->wiphy->bands[IEEE80211_BAND_2GHZ ] = &sc->sbands[IEEE80211_BAND_2GHZ ]; -if (test_bit (ATH9K_MODE_11A , sc->sc_ah->caps.wireless_modes)) +if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_5GHZ ) hw->wiphy->bands[IEEE80211_BAND_5GHZ ] = &sc->sbands[IEEE80211_BAND_5GHZ ];if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_HT ) { -if (test_bit (ATH9K_MODE_11G , sc->sc_ah->caps.wireless_modes)) +if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_2GHZ )setup_ht_cap (sc, &sc->sbands[IEEE80211_BAND_2GHZ ].ht_cap); -if (test_bit (ATH9K_MODE_11A , sc->sc_ah->caps.wireless_modes)) +if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_5GHZ )setup_ht_cap (sc, &sc->sbands[IEEE80211_BAND_5GHZ ].ht_cap); }
drivers/net/wireless/ath/ath9k/rc.c +4 -29
@@ -378,17 +378,6 @@ static const struct ath_rate_table ar5416_11g_ratetable = { 0, /* Phy rates allowed initially */ }; -static const struct ath_rate_table *hw_rate_table[ATH9K_MODE_MAX ] = { - [ATH9K_MODE_11A ] = &ar5416_11a_ratetable, - [ATH9K_MODE_11G ] = &ar5416_11g_ratetable, - [ATH9K_MODE_11NA_HT20 ] = &ar5416_11na_ratetable, - [ATH9K_MODE_11NG_HT20 ] = &ar5416_11ng_ratetable, - [ATH9K_MODE_11NA_HT40PLUS ] = &ar5416_11na_ratetable, - [ATH9K_MODE_11NA_HT40MINUS ] = &ar5416_11na_ratetable, - [ATH9K_MODE_11NG_HT40PLUS ] = &ar5416_11ng_ratetable, - [ATH9K_MODE_11NG_HT40MINUS ] = &ar5416_11ng_ratetable, -}; -static int ath_rc_get_rateindex (const struct ath_rate_table *rate_table,struct ieee80211_tx_rate *rate);
@@ -1203,35 +1192,21 @@ struct ath_rate_table *ath_choose_rate_table(struct ath_softc *sc, bool is_ht, bool is_cw_40) { - int mode = 0;struct ath_common *common =ath9k_hw_common (sc->sc_ah);switch (band) {case IEEE80211_BAND_2GHZ : - mode =ATH9K_MODE_11G ;if (is_ht) - mode =ATH9K_MODE_11NG_HT20 ; -if (is_cw_40) - mode =ATH9K_MODE_11NG_HT40PLUS ; -break ; +return &ar5416_11ng_ratetable; +return &ar5416_11g_ratetable;case IEEE80211_BAND_5GHZ : - mode =ATH9K_MODE_11A ;if (is_ht) - mode =ATH9K_MODE_11NA_HT20 ; -if (is_cw_40) - mode =ATH9K_MODE_11NA_HT40PLUS ; -break ; +return &ar5416_11na_ratetable; +return &ar5416_11a_ratetable;default :ath_print (common,ATH_DBG_CONFIG ,"Invalid band\n" );return NULL ; } - -BUG_ON (mode >=ATH9K_MODE_MAX ); - -ath_print (common,ATH_DBG_CONFIG , -"Choosing rate table for mode: %d\n" , mode); - -return hw_rate_table[mode]; } static void ath_rc_init(struct ath_softc *sc,
Signature · 1 line
1.7.2.2
Re: [PATCH 3/3] ath9k_hw: remove enum wireless_mode and its users
drivers/net/wireless/ath/ath9k/rc.c struct ath_rate_table *ath_choose_rate_table(struct ath_softc *sc, · line 1201
Quoted 2 lines · Felix Fietkau
drivers/net/wireless/ath/ath9k/rc.c +2
-0+return &ar5416_11ng_ratetable; +return &ar5416_11g_ratetable;
ineffective return.
drivers/net/wireless/ath/ath9k/rc.c struct ath_rate_table *ath_choose_rate_table(struct ath_softc *sc, · line 1205
Quoted 9 lines
drivers/net/wireless/ath/ath9k/rc.c +2
-5case IEEE80211_BAND_5GHZ : - mode =ATH9K_MODE_11A ;if (is_ht) - mode =ATH9K_MODE_11NA_HT20 ; -if (is_cw_40) - mode =ATH9K_MODE_11NA_HT40PLUS ; -break ; +return &ar5416_11na_ratetable; +return &ar5416_11a_ratetable;
same here.
Also, legacy rate tables can be removed.
Vasanth
Re: [PATCH 3/3] ath9k_hw: remove enum wireless_mode and its users
Quoted 15 lines · Vasanthakumar Thiagarajan
drivers/net/wireless/ath/ath9k/rc.c struct ath_rate_table *ath_choose_rate_table(struct ath_softc *sc, · line 1201
Quoted 2 lines · Felix Fietkau
drivers/net/wireless/ath/ath9k/rc.c +2
-0+return &ar5416_11ng_ratetable; +return &ar5416_11g_ratetable;ineffective return.
drivers/net/wireless/ath/ath9k/rc.c struct ath_rate_table *ath_choose_rate_table(struct ath_softc *sc, · line 1205
Quoted 9 lines
drivers/net/wireless/ath/ath9k/rc.c +2
-5case IEEE80211_BAND_5GHZ : - mode =ATH9K_MODE_11A ;if (is_ht) - mode =ATH9K_MODE_11NA_HT20 ; -if (is_cw_40) - mode =ATH9K_MODE_11NA_HT40PLUS ; -break ; +return &ar5416_11na_ratetable; +return &ar5416_11a_ratetable;same here.
Quoted 1 line
Also, legacy rate tables can be removed.
Never mind, I misread the code.
Vasanth