2010-09-21 12:15:20

by greearb

[permalink] [raw]
Subject: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

From: Ben Greear <[email protected]>

MAC address of AP isn't unique..need to add the device
name as well.

Signed-off-by: Ben Greear <[email protected]>
---
:100644 100644 76839d4... e802fce... M net/mac80211/debugfs_sta.c
net/mac80211/debugfs_sta.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index 76839d4..e802fce 100644
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -301,14 +301,15 @@ STA_OPS(ht_capa);
void ieee80211_sta_debugfs_add(struct sta_info *sta)
{
struct dentry *stations_dir = sta->local->debugfs.stations;
- u8 mac[3*ETH_ALEN];
+ u8 mac[3*ETH_ALEN + IFNAMSIZ + 2];

sta->debugfs.add_has_run = true;

if (!stations_dir)
return;

- snprintf(mac, sizeof(mac), "%pM", sta->sta.addr);
+ snprintf(mac, sizeof(mac), "%pM-%s",
+ sta->sta.addr, sta->sdata->name);

/*
* This might fail due to a race condition:
--
1.7.2.2



2010-09-23 08:30:45

by Johannes Berg

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On Wed, 2010-09-22 at 12:45 -0700, Ben Greear wrote:

> This look better?
>
> 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);

Yeah, but completely whitespace damaged, you're going to have to work on
your submissions :)

Also, why do you do "[mac80211] mac80211" rather than "[PATCH]
mac80211"?

johannes


2010-09-21 17:49:02

by Johannes Berg

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On Tue, 2010-09-21 at 19:03 +0200, Johannes Berg wrote:

> > >>> - snprintf(mac, sizeof(mac), "%pM", sta->sta.addr);
> > >>> + snprintf(mac, sizeof(mac), "%pM-%s",
> > >>> + sta->sta.addr, sta->sdata->name);
> > >>>
> > >>> /*
> > >>> * This might fail due to a race condition:
> > >>
> > >> I got to thinking: Is there any reason to put the sta.addr in there?
> > >>
> > >> Maybe just use sta->sdata->name? Seems it might be easier for
> > >> scripts to deal with?
> > >
> > > APs have many STAs
> >
> > So, when in STA mode, sta_info are related to local VIFs, but
> > in AP mode, they represent the remote wireless devices, with sdata pointing
> > to the local AP interface?
>
> No, there's a sta_info for each peer, which in STA mode is only the AP.

maybe the stations should be moved from phy0/stations/ to
phy0/wlan0/stations/ instead?

johannes


2010-09-21 18:02:22

by Ben Greear

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On 09/21/2010 10:49 AM, Johannes Berg wrote:
> On Tue, 2010-09-21 at 19:03 +0200, Johannes Berg wrote:
>
>>>>>> - snprintf(mac, sizeof(mac), "%pM", sta->sta.addr);
>>>>>> + snprintf(mac, sizeof(mac), "%pM-%s",
>>>>>> + sta->sta.addr, sta->sdata->name);
>>>>>>
>>>>>> /*
>>>>>> * This might fail due to a race condition:
>>>>>
>>>>> I got to thinking: Is there any reason to put the sta.addr in there?
>>>>>
>>>>> Maybe just use sta->sdata->name? Seems it might be easier for
>>>>> scripts to deal with?
>>>>
>>>> APs have many STAs
>>>
>>> So, when in STA mode, sta_info are related to local VIFs, but
>>> in AP mode, they represent the remote wireless devices, with sdata pointing
>>> to the local AP interface?
>>
>> No, there's a sta_info for each peer, which in STA mode is only the AP.
>
> maybe the stations should be moved from phy0/stations/ to
> phy0/wlan0/stations/ instead?

That would be fine with me.

Thanks,
Ben

>
> johannes


--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com


2010-09-22 19:45:57

by Ben Greear

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On 09/22/2010 11:48 AM, John W. Linville wrote:
> On Wed, Sep 22, 2010 at 08:31:05PM +0200, Johannes Berg wrote:
>> On Wed, 2010-09-22 at 10:34 -0700, Ben Greear wrote:
>>
>>> @@ -308,7 +308,7 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)
>>> if (!stations_dir)
>>> return;
>>>
>>> - snprintf(mac, sizeof(mac), "%pM", sta->sta.addr);
>>> + snprintf(mac, sizeof(mac), "sta-%pM", sta->sta.addr);
>>
>> Wouldn't a stations/ subdirectory in netdev:wlan0 be nicer? I don't
>> really care too much -- what do others think?
>
> Sounds better that way to me too...
>

This look better?

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

--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com


2010-09-21 17:03:26

by Johannes Berg

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On Tue, 2010-09-21 at 09:42 -0700, Ben Greear wrote:
> On 09/21/2010 09:30 AM, Johannes Berg wrote:
> > On Tue, 2010-09-21 at 09:25 -0700, Ben Greear wrote:
> >
> >>> - snprintf(mac, sizeof(mac), "%pM", sta->sta.addr);
> >>> + snprintf(mac, sizeof(mac), "%pM-%s",
> >>> + sta->sta.addr, sta->sdata->name);
> >>>
> >>> /*
> >>> * This might fail due to a race condition:
> >>
> >> I got to thinking: Is there any reason to put the sta.addr in there?
> >>
> >> Maybe just use sta->sdata->name? Seems it might be easier for
> >> scripts to deal with?
> >
> > APs have many STAs
>
> So, when in STA mode, sta_info are related to local VIFs, but
> in AP mode, they represent the remote wireless devices, with sdata pointing
> to the local AP interface?

No, there's a sta_info for each peer, which in STA mode is only the AP.

johannes


2010-09-21 16:42:07

by Ben Greear

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On 09/21/2010 09:30 AM, Johannes Berg wrote:
> On Tue, 2010-09-21 at 09:25 -0700, Ben Greear wrote:
>
>>> - snprintf(mac, sizeof(mac), "%pM", sta->sta.addr);
>>> + snprintf(mac, sizeof(mac), "%pM-%s",
>>> + sta->sta.addr, sta->sdata->name);
>>>
>>> /*
>>> * This might fail due to a race condition:
>>
>> I got to thinking: Is there any reason to put the sta.addr in there?
>>
>> Maybe just use sta->sdata->name? Seems it might be easier for
>> scripts to deal with?
>
> APs have many STAs

So, when in STA mode, sta_info are related to local VIFs, but
in AP mode, they represent the remote wireless devices, with sdata pointing
to the local AP interface?

Thanks,
Ben

>
> johannes


--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com


2010-09-21 16:25:03

by Ben Greear

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On 09/21/2010 05:15 AM, [email protected] wrote:
> From: Ben Greear<[email protected]>
>
> MAC address of AP isn't unique..need to add the device
> name as well.
>
> Signed-off-by: Ben Greear<[email protected]>
> ---
> :100644 100644 76839d4... e802fce... M net/mac80211/debugfs_sta.c
> net/mac80211/debugfs_sta.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
> index 76839d4..e802fce 100644
> --- a/net/mac80211/debugfs_sta.c
> +++ b/net/mac80211/debugfs_sta.c
> @@ -301,14 +301,15 @@ STA_OPS(ht_capa);
> void ieee80211_sta_debugfs_add(struct sta_info *sta)
> {
> struct dentry *stations_dir = sta->local->debugfs.stations;
> - u8 mac[3*ETH_ALEN];
> + u8 mac[3*ETH_ALEN + IFNAMSIZ + 2];
>
> sta->debugfs.add_has_run = true;
>
> if (!stations_dir)
> return;
>
> - snprintf(mac, sizeof(mac), "%pM", sta->sta.addr);
> + snprintf(mac, sizeof(mac), "%pM-%s",
> + sta->sta.addr, sta->sdata->name);
>
> /*
> * This might fail due to a race condition:

I got to thinking: Is there any reason to put the sta.addr in there?

Maybe just use sta->sdata->name? Seems it might be easier for
scripts to deal with?

Thanks,
Ben

--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com


2010-09-23 13:12:31

by Ben Greear

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On 09/23/2010 01:30 AM, Johannes Berg wrote:
> On Wed, 2010-09-22 at 12:45 -0700, Ben Greear wrote:
>
>> This look better?
>>
>> 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);
>
> Yeah, but completely whitespace damaged, you're going to have to work on
> your submissions :)
>
> Also, why do you do "[mac80211] mac80211" rather than "[PATCH]
> mac80211"?

That was just pasted into email..I'll fix up your other suggestions and
re-submit using git. I'll see if I can get the email subject more correct
as well.

Thanks,
Ben

>
> johannes


--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com

2010-09-22 16:59:45

by Ben Greear

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On 09/21/2010 10:49 AM, Johannes Berg wrote:
> On Tue, 2010-09-21 at 19:03 +0200, Johannes Berg wrote:
>
>>>>>> - snprintf(mac, sizeof(mac), "%pM", sta->sta.addr);
>>>>>> + snprintf(mac, sizeof(mac), "%pM-%s",
>>>>>> + sta->sta.addr, sta->sdata->name);
>>>>>>
>>>>>> /*
>>>>>> * This might fail due to a race condition:
>>>>>
>>>>> I got to thinking: Is there any reason to put the sta.addr in there?
>>>>>
>>>>> Maybe just use sta->sdata->name? Seems it might be easier for
>>>>> scripts to deal with?
>>>>
>>>> APs have many STAs
>>>
>>> So, when in STA mode, sta_info are related to local VIFs, but
>>> in AP mode, they represent the remote wireless devices, with sdata pointing
>>> to the local AP interface?
>>
>> No, there's a sta_info for each peer, which in STA mode is only the AP.
>
> maybe the stations should be moved from phy0/stations/ to
> phy0/wlan0/stations/ instead?

It doesn't matter either way to me, but I'd like to get one or another
patch upstream.

If you want me to change it to put stations under netdev:wlan0/ instead,
please just let me know.

Thanks,
Ben

>
> johannes


--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com


2010-09-22 18:59:37

by John W. Linville

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On Wed, Sep 22, 2010 at 08:31:05PM +0200, Johannes Berg wrote:
> On Wed, 2010-09-22 at 10:34 -0700, Ben Greear wrote:
>
> > @@ -308,7 +308,7 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)
> > if (!stations_dir)
> > return;
> >
> > - snprintf(mac, sizeof(mac), "%pM", sta->sta.addr);
> > + snprintf(mac, sizeof(mac), "sta-%pM", sta->sta.addr);
>
> Wouldn't a stations/ subdirectory in netdev:wlan0 be nicer? I don't
> really care too much -- what do others think?

Sounds better that way to me too...

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2010-09-22 17:01:39

by Johannes Berg

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On Wed, 2010-09-22 at 09:59 -0700, Ben Greear wrote:

> > maybe the stations should be moved from phy0/stations/ to
> > phy0/wlan0/stations/ instead?
>
> It doesn't matter either way to me, but I'd like to get one or another
> patch upstream.
>
> If you want me to change it to put stations under netdev:wlan0/ instead,
> please just let me know.

I'd prefer that, if you want to do this.

johannes


2010-09-23 08:37:00

by Johannes Berg

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On Wed, 2010-09-22 at 20:29 -0700, [email protected] wrote:
> From: Ben Greear <[email protected]>
>
> Create 'stations' sub-directory under each netdev:[vif-name]
> directory to hold all stations for that network device.
>
> Signed-off-by: Ben Greear <[email protected]>

Acked-by: Johannes Berg <[email protected]>

> ---
> :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



2010-09-21 16:30:19

by Johannes Berg

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On Tue, 2010-09-21 at 09:25 -0700, Ben Greear wrote:

> > - snprintf(mac, sizeof(mac), "%pM", sta->sta.addr);
> > + snprintf(mac, sizeof(mac), "%pM-%s",
> > + sta->sta.addr, sta->sdata->name);
> >
> > /*
> > * This might fail due to a race condition:
>
> I got to thinking: Is there any reason to put the sta.addr in there?
>
> Maybe just use sta->sdata->name? Seems it might be easier for
> scripts to deal with?

APs have many STAs

johannes


2010-09-22 17:34:24

by Ben Greear

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On 09/22/2010 10:01 AM, Johannes Berg wrote:
> On Wed, 2010-09-22 at 09:59 -0700, Ben Greear wrote:
>
>>> maybe the stations should be moved from phy0/stations/ to
>>> phy0/wlan0/stations/ instead?
>>
>> It doesn't matter either way to me, but I'd like to get one or another
>> patch upstream.
>>
>> If you want me to change it to put stations under netdev:wlan0/ instead,
>> please just let me know.
>
> I'd prefer that, if you want to do this.
>
> johannes

Something like this?

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_sta.c b/net/mac80211/debugfs_sta.c
index 76839d4..dea24e6 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.dir;
u8 mac[3*ETH_ALEN];

sta->debugfs.add_has_run = true;
@@ -308,7 +308,7 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)
if (!stations_dir)
return;

- snprintf(mac, sizeof(mac), "%pM", sta->sta.addr);
+ snprintf(mac, sizeof(mac), "sta-%pM", sta->sta.addr);

/*
* This might fail due to a race condition:
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 9346a6b..d03191c 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -899,7 +899,6 @@ struct ieee80211_local {
#ifdef CONFIG_MAC80211_DEBUGFS
struct local_debugfsdentries {
struct dentry *rcdir;
- struct dentry *stations;
struct dentry *keys;
} debugfs;
#endif


--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com


2010-10-16 19:00:45

by Christian Lamparter

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On Thursday 23 September 2010 10:36:58 Johannes Berg wrote:
> On Wed, 2010-09-22 at 20:29 -0700, [email protected] wrote:
> > From: Ben Greear <[email protected]>
> >
> > Create 'stations' sub-directory under each netdev:[vif-name]
> > directory to hold all stations for that network device.
> >
> > Signed-off-by: Ben Greear <[email protected]>
>
> Acked-by: Johannes Berg <[email protected]>

ieee80211_debugfs_key_add needs to be updated (debugfs_key.c).
Either the "station" symlink has to go, or we need to loop up
to which interface the sta belongs. currently it's hard-coded to
"sprintf(buf, "../../stations/%pM", sta->sta.addr);"
(something which no longer exists)

>
> > ---
> > :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);

2010-10-18 20:05:46

by Ben Greear

[permalink] [raw]
Subject: Re: [mac80211] mac80211: Support multiple VIFS per AP in debugfs.

On 10/16/2010 12:00 PM, Christian Lamparter wrote:
> On Thursday 23 September 2010 10:36:58 Johannes Berg wrote:
>> On Wed, 2010-09-22 at 20:29 -0700, [email protected] wrote:
>>> From: Ben Greear<[email protected]>
>>>
>>> Create 'stations' sub-directory under each netdev:[vif-name]
>>> directory to hold all stations for that network device.
>>>
>>> Signed-off-by: Ben Greear<[email protected]>
>>
>> Acked-by: Johannes Berg<[email protected]>
>
> ieee80211_debugfs_key_add needs to be updated (debugfs_key.c).
> Either the "station" symlink has to go, or we need to loop up
> to which interface the sta belongs. currently it's hard-coded to
> "sprintf(buf, "../../stations/%pM", sta->sta.addr);"
> (something which no longer exists)

I'm travelling for a few days, but will see what I can do to fix
this when I'm back if no one beats me to it.

Thanks,
Ben

--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com