Commit 50fb2e45 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 65a0667b
...@@ -2038,11 +2038,6 @@ static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband, ...@@ -2038,11 +2038,6 @@ static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,
ath_rc_node_update(sc->hw, priv_sta); ath_rc_node_update(sc->hw, priv_sta);
} }
static void ath_rate_clear(void *priv)
{
return;
}
static void *ath_rate_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir) static void *ath_rate_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
{ {
struct ath_softc *sc = hw->priv; struct ath_softc *sc = hw->priv;
...@@ -2092,7 +2087,6 @@ static struct rate_control_ops ath_rate_ops = { ...@@ -2092,7 +2087,6 @@ static struct rate_control_ops ath_rate_ops = {
.tx_status = ath_tx_status, .tx_status = ath_tx_status,
.get_rate = ath_get_rate, .get_rate = ath_get_rate,
.rate_init = ath_rate_init, .rate_init = ath_rate_init,
.clear = ath_rate_clear,
.alloc = ath_rate_alloc, .alloc = ath_rate_alloc,
.free = ath_rate_free, .free = ath_rate_free,
.alloc_sta = ath_rate_alloc_sta, .alloc_sta = ath_rate_alloc_sta,
......
...@@ -355,12 +355,6 @@ static void rs_free(void *priv) ...@@ -355,12 +355,6 @@ static void rs_free(void *priv)
return; return;
} }
static void rs_clear(void *priv)
{
return;
}
static void *rs_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp) static void *rs_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp)
{ {
struct iwl3945_rs_sta *rs_sta; struct iwl3945_rs_sta *rs_sta;
...@@ -784,7 +778,6 @@ static struct rate_control_ops rs_ops = { ...@@ -784,7 +778,6 @@ static struct rate_control_ops rs_ops = {
.tx_status = rs_tx_status, .tx_status = rs_tx_status,
.get_rate = rs_get_rate, .get_rate = rs_get_rate,
.rate_init = rs_rate_init, .rate_init = rs_rate_init,
.clear = rs_clear,
.alloc = rs_alloc, .alloc = rs_alloc,
.free = rs_free, .free = rs_free,
.alloc_sta = rs_alloc_sta, .alloc_sta = rs_alloc_sta,
......
...@@ -2393,19 +2393,6 @@ static void rs_free(void *priv_rate) ...@@ -2393,19 +2393,6 @@ static void rs_free(void *priv_rate)
return; return;
} }
static void rs_clear(void *priv_rate)
{
#ifdef CONFIG_IWLWIFI_DEBUG
struct iwl_priv *priv = (struct iwl_priv *) priv_rate;
IWL_DEBUG_RATE("enter\n");
/* TODO - add rate scale state reset */
IWL_DEBUG_RATE("leave\n");
#endif /* CONFIG_IWLWIFI_DEBUG */
}
static void rs_free_sta(void *priv_r, struct ieee80211_sta *sta, static void rs_free_sta(void *priv_r, struct ieee80211_sta *sta,
void *priv_sta) void *priv_sta)
{ {
...@@ -2593,7 +2580,6 @@ static struct rate_control_ops rs_ops = { ...@@ -2593,7 +2580,6 @@ static struct rate_control_ops rs_ops = {
.tx_status = rs_tx_status, .tx_status = rs_tx_status,
.get_rate = rs_get_rate, .get_rate = rs_get_rate,
.rate_init = rs_rate_init, .rate_init = rs_rate_init,
.clear = rs_clear,
.alloc = rs_alloc, .alloc = rs_alloc,
.free = rs_free, .free = rs_free,
.alloc_sta = rs_alloc_sta, .alloc_sta = rs_alloc_sta,
......
...@@ -1917,7 +1917,6 @@ struct rate_control_ops { ...@@ -1917,7 +1917,6 @@ struct rate_control_ops {
struct module *module; struct module *module;
const char *name; const char *name;
void *(*alloc)(struct ieee80211_hw *hw, struct dentry *debugfsdir); void *(*alloc)(struct ieee80211_hw *hw, struct dentry *debugfsdir);
void (*clear)(void *priv);
void (*free)(void *priv); void (*free)(void *priv);
void *(*alloc_sta)(void *priv, struct ieee80211_sta *sta, gfp_t gfp); void *(*alloc_sta)(void *priv, struct ieee80211_sta *sta, gfp_t gfp);
......
...@@ -63,12 +63,6 @@ static inline void rate_control_rate_init(struct sta_info *sta) ...@@ -63,12 +63,6 @@ static inline void rate_control_rate_init(struct sta_info *sta)
} }
static inline void rate_control_clear(struct ieee80211_local *local)
{
struct rate_control_ref *ref = local->rate_ctrl;
ref->ops->clear(ref->priv);
}
static inline void *rate_control_alloc_sta(struct rate_control_ref *ref, static inline void *rate_control_alloc_sta(struct rate_control_ref *ref,
struct ieee80211_sta *sta, struct ieee80211_sta *sta,
gfp_t gfp) gfp_t gfp)
......
...@@ -507,11 +507,6 @@ minstrel_free_sta(void *priv, struct ieee80211_sta *sta, void *priv_sta) ...@@ -507,11 +507,6 @@ minstrel_free_sta(void *priv, struct ieee80211_sta *sta, void *priv_sta)
kfree(mi); kfree(mi);
} }
static void
minstrel_clear(void *priv)
{
}
static void * static void *
minstrel_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir) minstrel_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
{ {
...@@ -565,7 +560,6 @@ static struct rate_control_ops mac80211_minstrel = { ...@@ -565,7 +560,6 @@ static struct rate_control_ops mac80211_minstrel = {
.tx_status = minstrel_tx_status, .tx_status = minstrel_tx_status,
.get_rate = minstrel_get_rate, .get_rate = minstrel_get_rate,
.rate_init = minstrel_rate_init, .rate_init = minstrel_rate_init,
.clear = minstrel_clear,
.alloc = minstrel_alloc, .alloc = minstrel_alloc,
.free = minstrel_free, .free = minstrel_free,
.alloc_sta = minstrel_alloc_sta, .alloc_sta = minstrel_alloc_sta,
......
...@@ -446,10 +446,6 @@ static void rate_control_pid_free(void *priv) ...@@ -446,10 +446,6 @@ static void rate_control_pid_free(void *priv)
kfree(pinfo); kfree(pinfo);
} }
static void rate_control_pid_clear(void *priv)
{
}
static void *rate_control_pid_alloc_sta(void *priv, struct ieee80211_sta *sta, static void *rate_control_pid_alloc_sta(void *priv, struct ieee80211_sta *sta,
gfp_t gfp) gfp_t gfp)
{ {
...@@ -480,7 +476,6 @@ static struct rate_control_ops mac80211_rcpid = { ...@@ -480,7 +476,6 @@ static struct rate_control_ops mac80211_rcpid = {
.tx_status = rate_control_pid_tx_status, .tx_status = rate_control_pid_tx_status,
.get_rate = rate_control_pid_get_rate, .get_rate = rate_control_pid_get_rate,
.rate_init = rate_control_pid_rate_init, .rate_init = rate_control_pid_rate_init,
.clear = rate_control_pid_clear,
.alloc = rate_control_pid_alloc, .alloc = rate_control_pid_alloc,
.free = rate_control_pid_free, .free = rate_control_pid_free,
.alloc_sta = rate_control_pid_alloc_sta, .alloc_sta = rate_control_pid_alloc_sta,
......
...@@ -647,8 +647,6 @@ int ieee80211_set_freq(struct ieee80211_sub_if_data *sdata, int freqMHz) ...@@ -647,8 +647,6 @@ int ieee80211_set_freq(struct ieee80211_sub_if_data *sdata, int freqMHz)
else else
ret = ieee80211_hw_config( ret = ieee80211_hw_config(
local, IEEE80211_CONF_CHANGE_CHANNEL); local, IEEE80211_CONF_CHANGE_CHANNEL);
rate_control_clear(local);
} }
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment