From: Johannes Berg <johannes@sipsolutions.net>
To: greearb@gmail.com
Cc: linux-wireless@vger.kernel.org, Ben Greear <greearb@candelatech.com>
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.
Date: Thu, 23 Sep 2010 10:36:58 +0200 [thread overview]
Message-ID: <1285231018.3691.8.camel@jlt3.sipsolutions.net> (raw)
In-Reply-To: <1285212541-6834-1-git-send-email-greearb@candelatech.com>
On Wed, 2010-09-22 at 20:29 -0700, greearb@gmail.com wrote:
> From: Ben Greear <greearb@candelatech.com>
>
> Create 'stations' sub-directory under each netdev:[vif-name]
> directory to hold all stations for that network device.
>
> Signed-off-by: Ben Greear <greearb@candelatech.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
> ---
> :100644 100644 e81ef4e... ebd5b69... M net/mac80211/debugfs.c
> :100644 100644 20b2998... 3e12430... M net/mac80211/debugfs_netdev.c
> :100644 100644 76839d4... 6b7ff9f... M net/mac80211/debugfs_sta.c
> :100644 100644 9346a6b... 3c7c230... M net/mac80211/ieee80211_i.h
> net/mac80211/debugfs.c | 1 -
> net/mac80211/debugfs_netdev.c | 3 +++
> net/mac80211/debugfs_sta.c | 2 +-
> net/mac80211/ieee80211_i.h | 2 +-
> 4 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
> index e81ef4e..ebd5b69 100644
> --- a/net/mac80211/debugfs.c
> +++ b/net/mac80211/debugfs.c
> @@ -368,7 +368,6 @@ void debugfs_hw_add(struct ieee80211_local *local)
> if (!phyd)
> return;
>
> - local->debugfs.stations = debugfs_create_dir("stations", phyd);
> local->debugfs.keys = debugfs_create_dir("keys", phyd);
>
> DEBUGFS_ADD(frequency);
> diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
> index 20b2998..3e12430 100644
> --- a/net/mac80211/debugfs_netdev.c
> +++ b/net/mac80211/debugfs_netdev.c
> @@ -409,6 +409,9 @@ void ieee80211_debugfs_add_netdev(struct ieee80211_sub_if_data *sdata)
> sprintf(buf, "netdev:%s", sdata->name);
> sdata->debugfs.dir = debugfs_create_dir(buf,
> sdata->local->hw.wiphy->debugfsdir);
> + if (sdata->debugfs.dir)
> + sdata->debugfs.subdir_stations = debugfs_create_dir("stations",
> + sdata->debugfs.dir);
> add_files(sdata);
> }
>
> diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
> index 76839d4..6b7ff9f 100644
> --- a/net/mac80211/debugfs_sta.c
> +++ b/net/mac80211/debugfs_sta.c
> @@ -300,7 +300,7 @@ STA_OPS(ht_capa);
>
> void ieee80211_sta_debugfs_add(struct sta_info *sta)
> {
> - struct dentry *stations_dir = sta->local->debugfs.stations;
> + struct dentry *stations_dir = sta->sdata->debugfs.subdir_stations;
> u8 mac[3*ETH_ALEN];
>
> sta->debugfs.add_has_run = true;
> diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
> index 9346a6b..3c7c230 100644
> --- a/net/mac80211/ieee80211_i.h
> +++ b/net/mac80211/ieee80211_i.h
> @@ -564,6 +564,7 @@ struct ieee80211_sub_if_data {
> #ifdef CONFIG_MAC80211_DEBUGFS
> struct {
> struct dentry *dir;
> + struct dentry *subdir_stations;
> struct dentry *default_key;
> struct dentry *default_mgmt_key;
> } debugfs;
> @@ -899,7 +900,6 @@ struct ieee80211_local {
> #ifdef CONFIG_MAC80211_DEBUGFS
> struct local_debugfsdentries {
> struct dentry *rcdir;
> - struct dentry *stations;
> struct dentry *keys;
> } debugfs;
> #endif
next prev parent reply other threads:[~2010-09-23 8:37 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-23 3:29 [mac80211] mac80211: Support multiple VIFS per AP in debugfs greearb
2010-09-23 8:36 ` Johannes Berg [this message]
2010-10-16 19:00 ` Christian Lamparter
2010-10-18 20:05 ` Ben Greear
[not found] ` <4CDAF182.4030409@candelatech.com>
2010-11-10 20:01 ` Christian Lamparter
-- strict thread matches above, loose matches on Subject: below --
2010-09-21 12:15 greearb
2010-09-21 16:25 ` Ben Greear
2010-09-21 16:30 ` Johannes Berg
2010-09-21 16:42 ` Ben Greear
2010-09-21 17:03 ` Johannes Berg
2010-09-21 17:49 ` Johannes Berg
2010-09-21 18:02 ` Ben Greear
2010-09-22 16:59 ` Ben Greear
2010-09-22 17:01 ` Johannes Berg
2010-09-22 17:34 ` Ben Greear
2010-09-22 18:31 ` Johannes Berg
2010-09-22 18:48 ` John W. Linville
2010-09-22 19:45 ` Ben Greear
2010-09-23 8:30 ` Johannes Berg
2010-09-23 13:12 ` Ben Greear
2010-09-21 4:21 greearb
2010-09-21 6:48 ` Johannes Berg
2010-09-21 12:04 ` Ben Greear
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=1285231018.3691.8.camel@jlt3.sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=greearb@candelatech.com \
--cc=greearb@gmail.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).