diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-09 14:40:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-09 14:40:09 -0700 |
| commit | 8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc (patch) | |
| tree | e5e6cc8637a44354997624f26d4d55834c9915b4 /net/core | |
| parent | cd7e1f0b056c071860db65c847a854b3093d6606 (diff) | |
| parent | eab2ec83dbf0e32e28f3108f302ffdaa225d4cce (diff) | |
| download | linux-8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/net-sysfs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 4242e94ff1a5..753c420060df 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -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 */ |