From: Johannes Berg <johannes@sipsolutions.net>
To: linux-wireless@vger.kernel.org
Cc: j@w1.fi, greearb@candelatech.com,
Johannes Berg <johannes.berg@intel.com>
Subject: [RFC v2 4/7] mac80211: remove local pointer from rate_ctrl_ref
Date: Tue, 14 Feb 2017 14:22:05 +0100 [thread overview]
Message-ID: <20170214132208.8715-5-johannes@sipsolutions.net> (raw)
In-Reply-To: <20170214132208.8715-1-johannes@sipsolutions.net>
From: Johannes Berg <johannes.berg@intel.com>
This pointer really isn't needed, so remove it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/mac80211/rate.c | 10 +++++-----
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 @@ static struct rate_control_ref *rate_control_alloc(const char *name,
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;
};
--
2.9.3
next prev parent reply other threads:[~2017-02-14 13:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-14 13:22 VHT extended NSS BW support framework Johannes Berg
2017-02-14 13:22 ` [RFC v2 1/7] ieee80211: rename CCFS1/CCFS2 to CCFS0/CCFS1 Johannes Berg
2017-02-14 13:22 ` [RFC v2 2/7] ieee80211: define HT operation CCFS2 field Johannes Berg
2017-02-14 13:22 ` [RFC v2 3/7] ieee80211: add new VHT capability fields/parsing Johannes Berg
2017-02-15 9:08 ` Arend Van Spriel
2017-02-15 9:16 ` Johannes Berg
2017-02-15 9:36 ` Arend Van Spriel
2017-02-15 9:48 ` Johannes Berg
2017-02-15 10:34 ` Arend Van Spriel
2017-02-15 10:34 ` Arend Van Spriel
2017-02-15 10:41 ` Johannes Berg
2017-02-15 10:54 ` Arend Van Spriel
2017-02-14 13:22 ` Johannes Berg [this message]
2017-02-14 13:22 ` [RFC v2 5/7] mac80211: introduce capability flags for VHT EXT NSS support Johannes Berg
2017-02-14 13:22 ` [RFC v2 6/7] mac80211: add ability to parse CCFS2 Johannes Berg
2017-02-14 13:22 ` [RFC v2 7/7] mac80211: copy VHT EXT NSS BW Support/Capable data to station Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170214132208.8715-5-johannes@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=greearb@candelatech.com \
--cc=j@w1.fi \
--cc=johannes.berg@intel.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).