On Fri, 2012-11-16 at 10:20 -0800, Linus Torvalds wrote: > On Tue, Nov 13, 2012 at 12:27 AM, Johannes Berg > <[email protected]> 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 <[email protected]> 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: [email protected] [3.6] Reported-by: Dave Airlie <[email protected]> Reported-by: Bill Nottingham <[email protected]> Signed-off-by: Johannes Berg <[email protected]> --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
