diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-16 05:21:49 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:37 -0400 |
commit | 50fb2e4572141770380f5919793c6e575fa3474b (patch) | |
tree | 6227726fda3e7b54515b6738bcf62b5f395ded23 /drivers/net | |
parent | 65a0667b43ff746b2964b2a257ffff1a4747e19d (diff) |
mac80211: remove rate_control_clear
"Clearing" the rate control algorithm is pointless, none of
the algorithms actually uses this operation and it's not even
invoked properly for all channel switching. Also, there's no
need to since rate control algorithms work per station.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath9k/rc.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 14 |
3 files changed, 0 insertions, 27 deletions
diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c index 6afafeddeda2..9ce535915a1a 100644 --- a/drivers/net/wireless/ath9k/rc.c +++ b/drivers/net/wireless/ath9k/rc.c | |||
@@ -2038,11 +2038,6 @@ static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband, | |||
2038 | ath_rc_node_update(sc->hw, priv_sta); | 2038 | ath_rc_node_update(sc->hw, priv_sta); |
2039 | } | 2039 | } |
2040 | 2040 | ||
2041 | static void ath_rate_clear(void *priv) | ||
2042 | { | ||
2043 | return; | ||
2044 | } | ||
2045 | |||
2046 | static void *ath_rate_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir) | 2041 | static void *ath_rate_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir) |
2047 | { | 2042 | { |
2048 | struct ath_softc *sc = hw->priv; | 2043 | struct ath_softc *sc = hw->priv; |
@@ -2092,7 +2087,6 @@ static struct rate_control_ops ath_rate_ops = { | |||
2092 | .tx_status = ath_tx_status, | 2087 | .tx_status = ath_tx_status, |
2093 | .get_rate = ath_get_rate, | 2088 | .get_rate = ath_get_rate, |
2094 | .rate_init = ath_rate_init, | 2089 | .rate_init = ath_rate_init, |
2095 | .clear = ath_rate_clear, | ||
2096 | .alloc = ath_rate_alloc, | 2090 | .alloc = ath_rate_alloc, |
2097 | .free = ath_rate_free, | 2091 | .free = ath_rate_free, |
2098 | .alloc_sta = ath_rate_alloc_sta, | 2092 | .alloc_sta = ath_rate_alloc_sta, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c index f440ed0fe543..bfeef701b1fd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c | |||
@@ -355,12 +355,6 @@ static void rs_free(void *priv) | |||
355 | return; | 355 | return; |
356 | } | 356 | } |
357 | 357 | ||
358 | static void rs_clear(void *priv) | ||
359 | { | ||
360 | return; | ||
361 | } | ||
362 | |||
363 | |||
364 | static void *rs_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp) | 358 | static void *rs_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp) |
365 | { | 359 | { |
366 | struct iwl3945_rs_sta *rs_sta; | 360 | struct iwl3945_rs_sta *rs_sta; |
@@ -784,7 +778,6 @@ static struct rate_control_ops rs_ops = { | |||
784 | .tx_status = rs_tx_status, | 778 | .tx_status = rs_tx_status, |
785 | .get_rate = rs_get_rate, | 779 | .get_rate = rs_get_rate, |
786 | .rate_init = rs_rate_init, | 780 | .rate_init = rs_rate_init, |
787 | .clear = rs_clear, | ||
788 | .alloc = rs_alloc, | 781 | .alloc = rs_alloc, |
789 | .free = rs_free, | 782 | .free = rs_free, |
790 | .alloc_sta = rs_alloc_sta, | 783 | .alloc_sta = rs_alloc_sta, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index f685e5d6c281..6fdb2fb755b0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |||
@@ -2393,19 +2393,6 @@ static void rs_free(void *priv_rate) | |||
2393 | return; | 2393 | return; |
2394 | } | 2394 | } |
2395 | 2395 | ||
2396 | static void rs_clear(void *priv_rate) | ||
2397 | { | ||
2398 | #ifdef CONFIG_IWLWIFI_DEBUG | ||
2399 | struct iwl_priv *priv = (struct iwl_priv *) priv_rate; | ||
2400 | |||
2401 | IWL_DEBUG_RATE("enter\n"); | ||
2402 | |||
2403 | /* TODO - add rate scale state reset */ | ||
2404 | |||
2405 | IWL_DEBUG_RATE("leave\n"); | ||
2406 | #endif /* CONFIG_IWLWIFI_DEBUG */ | ||
2407 | } | ||
2408 | |||
2409 | static void rs_free_sta(void *priv_r, struct ieee80211_sta *sta, | 2396 | static void rs_free_sta(void *priv_r, struct ieee80211_sta *sta, |
2410 | void *priv_sta) | 2397 | void *priv_sta) |
2411 | { | 2398 | { |
@@ -2593,7 +2580,6 @@ static struct rate_control_ops rs_ops = { | |||
2593 | .tx_status = rs_tx_status, | 2580 | .tx_status = rs_tx_status, |
2594 | .get_rate = rs_get_rate, | 2581 | .get_rate = rs_get_rate, |
2595 | .rate_init = rs_rate_init, | 2582 | .rate_init = rs_rate_init, |
2596 | .clear = rs_clear, | ||
2597 | .alloc = rs_alloc, | 2583 | .alloc = rs_alloc, |
2598 | .free = rs_free, | 2584 | .free = rs_free, |
2599 | .alloc_sta = rs_alloc_sta, | 2585 | .alloc_sta = rs_alloc_sta, |