diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2017-02-15 15:02:07 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-03-06 09:21:43 +0100 |
| commit | a858958b689211dcfe54cdd94c93160d2d659eba (patch) | |
| tree | 2c5dfee349f132fc8068f8b8421c21a915f46bbc /net/mac80211 | |
| parent | ieee80211: rename CCFS1/CCFS2 to CCFS0/CCFS1 (diff) | |
| download | linux-dev-a858958b689211dcfe54cdd94c93160d2d659eba.tar.xz linux-dev-a858958b689211dcfe54cdd94c93160d2d659eba.zip | |
mac80211: remove local pointer from rate_ctrl_ref
This pointer really isn't needed, so remove it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/rate.c | 10 | ||||
| -rw-r--r-- | net/mac80211/rate.h | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index 206698bc93f4..094c15645228 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -208,7 +208,6 @@ static struct rate_control_ref *rate_control_alloc(const char *name, ref = kmalloc(sizeof(struct rate_control_ref), GFP_KERNEL); if (!ref) return NULL; - ref->local = local; ref->ops = ieee80211_rate_control_ops_get(name); if (!ref->ops) goto free; @@ -229,13 +228,14 @@ free: return NULL; } -static void rate_control_free(struct rate_control_ref *ctrl_ref) +static void rate_control_free(struct ieee80211_local *local, + struct rate_control_ref *ctrl_ref) { ctrl_ref->ops->free(ctrl_ref->priv); #ifdef CONFIG_MAC80211_DEBUGFS - debugfs_remove_recursive(ctrl_ref->local->debugfs.rcdir); - ctrl_ref->local->debugfs.rcdir = NULL; + debugfs_remove_recursive(local->debugfs.rcdir); + local->debugfs.rcdir = NULL; #endif kfree(ctrl_ref); @@ -936,6 +936,6 @@ void rate_control_deinitialize(struct ieee80211_local *local) return; local->rate_ctrl = NULL; - rate_control_free(ref); + rate_control_free(local, ref); } diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h index 8d3260785b94..d51a1cce4d4a 100644 --- a/net/mac80211/rate.h +++ b/net/mac80211/rate.h @@ -20,7 +20,6 @@ #include "driver-ops.h" struct rate_control_ref { - struct ieee80211_local *local; const struct rate_control_ops *ops; void *priv; }; |