Re: removal of sysfs wext extension broke on F16

Re: removal of sysfs wext extension broke on F16

[Johannes Berg]

On Fri, 2012-11-16 at 10:20 -0800, Linus Torvalds wrote:
> On Tue, Nov 13, 2012 at 12:27 AM, Johannes Berg
> <johannes@sipsolutions.net> wrote:
> >
> > Should I revert it and send it in my next pull request?
> 
> Please do. Or perhaps we could just add the directory back, without
> the actual entries, if that is sufficient..

Yeah, that does seem to be sufficient, I'll queue up the patch below.

johannes


>From 8d6422678975e8128904a5a7a9ba02e94ccc1130 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 16 Nov 2012 20:46:19 +0100
Subject: [PATCH] wireless: add back sysfs directory

commit 35b2a113cb0298d4f9a1263338b456094a414057 broke (at least)
Fedora's networking scripts, they check for the existence of the
wireless directory. As the files aren't used, add the directory
back and not the files. Also do it for both drivers based on the
old wireless extensions and cfg80211, regardless of whether the
compat code for wext is built into cfg80211 or not.

Cc: stable@vger.kernel.org [3.6]
Reported-by: Dave Airlie <airlied@gmail.com>
Reported-by: Bill Nottingham <notting@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 net/core/net-sysfs.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index bcf02f6..4ce301a 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -429,6 +429,12 @@ static struct attribute_group netstat_group = {
 	.name  = "statistics",
 	.attrs  = netstat_attrs,
 };
+
+#if IS_ENABLED(CONFIG_WIRELESS_EXT) || IS_ENABLED(CONFIG_CFG80211)
+static struct attribute_group wireless_group = {
+	.name = "wireless",
+};
+#endif
 #endif /* CONFIG_SYSFS */
 
 #ifdef CONFIG_RPS
@@ -1409,6 +1415,15 @@ int netdev_register_kobject(struct net_device *net)
 		groups++;
 
 	*groups++ = &netstat_group;
+
+#if IS_ENABLED(CONFIG_WIRELESS_EXT) || IS_ENABLED(CONFIG_CFG80211)
+	if (net->ieee80211_ptr)
+		*groups++ = &wireless_group;
+#if IS_ENABLED(CONFIG_WIRELESS_EXT)
+	else if (net->wireless_handlers)
+		*groups++ = &wireless_group;
+#endif
+#endif
 #endif /* CONFIG_SYSFS */
 
 	error = device_add(dev);
-- 
1.8.0

Re: removal of sysfs wext extension broke on F16

[Johannes Berg]

On Fri, 2012-11-16 at 21:35 +0100, Johannes Berg wrote:
> On Fri, 2012-11-16 at 10:20 -0800, Linus Torvalds wrote:
> > On Tue, Nov 13, 2012 at 12:27 AM, Johannes Berg
> > <johannes@sipsolutions.net> wrote:
> > >
> > > Should I revert it and send it in my next pull request?
> > 
> > Please do. Or perhaps we could just add the directory back, without
> > the actual entries, if that is sufficient..
> 
> Yeah, that does seem to be sufficient, I'll queue up the patch below.

Err, no, wishful thinking. I need a *little* bit more for sysfs to work.

johannes

Re: removal of sysfs wext extension broke on F16

[Johannes Berg]

On Fri, 2012-11-16 at 21:36 +0100, Johannes Berg wrote:
> On Fri, 2012-11-16 at 21:35 +0100, Johannes Berg wrote:
> > On Fri, 2012-11-16 at 10:20 -0800, Linus Torvalds wrote:
> > > On Tue, Nov 13, 2012 at 12:27 AM, Johannes Berg
> > > <johannes@sipsolutions.net> wrote:
> > > >
> > > > Should I revert it and send it in my next pull request?
> > > 
> > > Please do. Or perhaps we could just add the directory back, without
> > > the actual entries, if that is sufficient..
> > 
> > Yeah, that does seem to be sufficient, I'll queue up the patch below.
> 
> Err, no, wishful thinking. I need a *little* bit more for sysfs to work.

This works, sorry about that.

>From 38c1a01cf10c6e4049b4ffbd4a6af655df2a46e1 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 16 Nov 2012 20:46:19 +0100
Subject: [PATCH] wireless: add back sysfs directory

commit 35b2a113cb0298d4f9a1263338b456094a414057 broke (at least)
Fedora's networking scripts, they check for the existence of the
wireless directory. As the files aren't used, add the directory
back and not the files. Also do it for both drivers based on the
old wireless extensions and cfg80211, regardless of whether the
compat code for wext is built into cfg80211 or not.

Cc: stable@vger.kernel.org [3.6]
Reported-by: Dave Airlie <airlied@gmail.com>
Reported-by: Bill Nottingham <notting@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 net/core/net-sysfs.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index bcf02f6..017a8ba 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -429,6 +429,17 @@ static struct attribute_group netstat_group = {
 	.name  = "statistics",
 	.attrs  = netstat_attrs,
 };
+
+#if IS_ENABLED(CONFIG_WIRELESS_EXT) || IS_ENABLED(CONFIG_CFG80211)
+static struct attribute *wireless_attrs[] = {
+	NULL
+};
+
+static struct attribute_group wireless_group = {
+	.name = "wireless",
+	.attrs = wireless_attrs,
+};
+#endif
 #endif /* CONFIG_SYSFS */
 
 #ifdef CONFIG_RPS
@@ -1409,6 +1420,15 @@ int netdev_register_kobject(struct net_device *net)
 		groups++;
 
 	*groups++ = &netstat_group;
+
+#if IS_ENABLED(CONFIG_WIRELESS_EXT) || IS_ENABLED(CONFIG_CFG80211)
+	if (net->ieee80211_ptr)
+		*groups++ = &wireless_group;
+#if IS_ENABLED(CONFIG_WIRELESS_EXT)
+	else if (net->wireless_handlers)
+		*groups++ = &wireless_group;
+#endif
+#endif
 #endif /* CONFIG_SYSFS */
 
 	error = device_add(dev);
-- 
1.8.0

Re: removal of sysfs wext extension broke on F16

[Sven-Haegar Koch]

On Fri, 16 Nov 2012, Johannes Berg wrote:

> On Fri, 2012-11-16 at 21:36 +0100, Johannes Berg wrote:
> > On Fri, 2012-11-16 at 21:35 +0100, Johannes Berg wrote:
> > > On Fri, 2012-11-16 at 10:20 -0800, Linus Torvalds wrote:
> > > > On Tue, Nov 13, 2012 at 12:27 AM, Johannes Berg
> > > > <johannes@sipsolutions.net> wrote:
> > > > >
> > > > > Should I revert it and send it in my next pull request?
> > > > 
> > > > Please do. Or perhaps we could just add the directory back, without
> > > > the actual entries, if that is sufficient..
> > > 
> > > Yeah, that does seem to be sufficient, I'll queue up the patch below.
> > 
> > Err, no, wishful thinking. I need a *little* bit more for sysfs to work.
> 
> This works, sorry about that.

> +#if IS_ENABLED(CONFIG_WIRELESS_EXT) || IS_ENABLED(CONFIG_CFG80211)
> +static struct attribute *wireless_attrs[] = {
> +	NULL
> +};
> +
> +static struct attribute_group wireless_group = {
> +	.name = "wireless",
> +	.attrs = wireless_attrs,
> +};
> +#endif
>  #endif /* CONFIG_SYSFS */
>  

How about a small comment in the source why it is there? I suppose 
otherwise in a year or two someone will find it, see "WTF? Useless 
empty directory?" and try to remove it again...

c'ya
sven-haegar

-- 
Three may keep a secret, if two of them are dead.
- Ben F.

Re: removal of sysfs wext extension broke on F16

[Julian Calaby]

Hi Sven,

On Sat, Nov 17, 2012 at 9:32 AM, Sven-Haegar Koch <haegar@sdinet.de> wrote:
> On Fri, 16 Nov 2012, Johannes Berg wrote:
>
>> On Fri, 2012-11-16 at 21:36 +0100, Johannes Berg wrote:
>> > On Fri, 2012-11-16 at 21:35 +0100, Johannes Berg wrote:
>> > > On Fri, 2012-11-16 at 10:20 -0800, Linus Torvalds wrote:
>> > > > On Tue, Nov 13, 2012 at 12:27 AM, Johannes Berg
>> > > > <johannes@sipsolutions.net> wrote:
>> > > > >
>> > > > > Should I revert it and send it in my next pull request?
>> > > >
>> > > > Please do. Or perhaps we could just add the directory back, without
>> > > > the actual entries, if that is sufficient..
>> > >
>> > > Yeah, that does seem to be sufficient, I'll queue up the patch below.
>> >
>> > Err, no, wishful thinking. I need a *little* bit more for sysfs to work.
>>
>> This works, sorry about that.
>
>> +#if IS_ENABLED(CONFIG_WIRELESS_EXT) || IS_ENABLED(CONFIG_CFG80211)
>> +static struct attribute *wireless_attrs[] = {
>> +     NULL
>> +};
>> +
>> +static struct attribute_group wireless_group = {
>> +     .name = "wireless",
>> +     .attrs = wireless_attrs,
>> +};
>> +#endif
>>  #endif /* CONFIG_SYSFS */
>>
>
> How about a small comment in the source why it is there? I suppose
> otherwise in a year or two someone will find it, see "WTF? Useless
> empty directory?" and try to remove it again...

Hopefully by then Fedora's networking scripts won't need it =)

Thanks,

-- 
Julian Calaby

Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/