aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/rate.h6
-rw-r--r--net/mac80211/rc80211_minstrel.c6
-rw-r--r--net/mac80211/rc80211_pid_algo.c5
-rw-r--r--net/mac80211/util.c2
4 files changed, 0 insertions, 19 deletions
diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h
index 7c25edf9ac55..928da625e281 100644
--- a/net/mac80211/rate.h
+++ b/net/mac80211/rate.h
@@ -63,12 +63,6 @@ static inline void rate_control_rate_init(struct sta_info *sta)
63} 63}
64 64
65 65
66static inline void rate_control_clear(struct ieee80211_local *local)
67{
68 struct rate_control_ref *ref = local->rate_ctrl;
69 ref->ops->clear(ref->priv);
70}
71
72static inline void *rate_control_alloc_sta(struct rate_control_ref *ref, 66static inline void *rate_control_alloc_sta(struct rate_control_ref *ref,
73 struct ieee80211_sta *sta, 67 struct ieee80211_sta *sta,
74 gfp_t gfp) 68 gfp_t gfp)
diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c
index c10debc29ad6..c643e373fc50 100644
--- a/net/mac80211/rc80211_minstrel.c
+++ b/net/mac80211/rc80211_minstrel.c
@@ -507,11 +507,6 @@ minstrel_free_sta(void *priv, struct ieee80211_sta *sta, void *priv_sta)
507 kfree(mi); 507 kfree(mi);
508} 508}
509 509
510static void
511minstrel_clear(void *priv)
512{
513}
514
515static void * 510static void *
516minstrel_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir) 511minstrel_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
517{ 512{
@@ -565,7 +560,6 @@ static struct rate_control_ops mac80211_minstrel = {
565 .tx_status = minstrel_tx_status, 560 .tx_status = minstrel_tx_status,
566 .get_rate = minstrel_get_rate, 561 .get_rate = minstrel_get_rate,
567 .rate_init = minstrel_rate_init, 562 .rate_init = minstrel_rate_init,
568 .clear = minstrel_clear,
569 .alloc = minstrel_alloc, 563 .alloc = minstrel_alloc,
570 .free = minstrel_free, 564 .free = minstrel_free,
571 .alloc_sta = minstrel_alloc_sta, 565 .alloc_sta = minstrel_alloc_sta,
diff --git a/net/mac80211/rc80211_pid_algo.c b/net/mac80211/rc80211_pid_algo.c
index 92caecfcee78..2328ba568039 100644
--- a/net/mac80211/rc80211_pid_algo.c
+++ b/net/mac80211/rc80211_pid_algo.c
@@ -446,10 +446,6 @@ static void rate_control_pid_free(void *priv)
446 kfree(pinfo); 446 kfree(pinfo);
447} 447}
448 448
449static void rate_control_pid_clear(void *priv)
450{
451}
452
453static void *rate_control_pid_alloc_sta(void *priv, struct ieee80211_sta *sta, 449static void *rate_control_pid_alloc_sta(void *priv, struct ieee80211_sta *sta,
454 gfp_t gfp) 450 gfp_t gfp)
455{ 451{
@@ -480,7 +476,6 @@ static struct rate_control_ops mac80211_rcpid = {
480 .tx_status = rate_control_pid_tx_status, 476 .tx_status = rate_control_pid_tx_status,
481 .get_rate = rate_control_pid_get_rate, 477 .get_rate = rate_control_pid_get_rate,
482 .rate_init = rate_control_pid_rate_init, 478 .rate_init = rate_control_pid_rate_init,
483 .clear = rate_control_pid_clear,
484 .alloc = rate_control_pid_alloc, 479 .alloc = rate_control_pid_alloc,
485 .free = rate_control_pid_free, 480 .free = rate_control_pid_free,
486 .alloc_sta = rate_control_pid_alloc_sta, 481 .alloc_sta = rate_control_pid_alloc_sta,
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index ec8b6335f0c1..0f841317c7e9 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -647,8 +647,6 @@ int ieee80211_set_freq(struct ieee80211_sub_if_data *sdata, int freqMHz)
647 else 647 else
648 ret = ieee80211_hw_config( 648 ret = ieee80211_hw_config(
649 local, IEEE80211_CONF_CHANGE_CHANNEL); 649 local, IEEE80211_CONF_CHANGE_CHANNEL);
650
651 rate_control_clear(local);
652 } 650 }
653 651
654 return ret; 652 return ret;