Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
This commit is contained in:
@@ -543,8 +543,12 @@ int netdev_register_kobject(struct net_device *net)
|
||||
*groups++ = &netstat_group;
|
||||
|
||||
#ifdef CONFIG_WIRELESS_EXT_SYSFS
|
||||
if (net->wireless_handlers || net->ieee80211_ptr)
|
||||
if (net->ieee80211_ptr)
|
||||
*groups++ = &wireless_group;
|
||||
#ifdef CONFIG_WIRELESS_EXT
|
||||
else if (net->wireless_handlers)
|
||||
*groups++ = &wireless_group;
|
||||
#endif
|
||||
#endif
|
||||
#endif /* CONFIG_SYSFS */
|
||||
|
||||
|
Reference in New Issue
Block a user