提交 38c1a01c 编写于 作者: J Johannes Berg

wireless: add back sysfs directory

commit 35b2a113 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: NDave Airlie <airlied@gmail.com>
Reported-by: NBill Nottingham <notting@redhat.com>
Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
上级 b78a4932
...@@ -429,6 +429,17 @@ static struct attribute_group netstat_group = { ...@@ -429,6 +429,17 @@ static struct attribute_group netstat_group = {
.name = "statistics", .name = "statistics",
.attrs = netstat_attrs, .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 */ #endif /* CONFIG_SYSFS */
#ifdef CONFIG_RPS #ifdef CONFIG_RPS
...@@ -1409,6 +1420,15 @@ int netdev_register_kobject(struct net_device *net) ...@@ -1409,6 +1420,15 @@ int netdev_register_kobject(struct net_device *net)
groups++; groups++;
*groups++ = &netstat_group; *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 */ #endif /* CONFIG_SYSFS */
error = device_add(dev); error = device_add(dev);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册