diff options
author | David S. Miller <davem@davemloft.net> | 2009-10-09 17:40:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-09 17:40:09 -0400 |
commit | 8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc (patch) | |
tree | e5e6cc8637a44354997624f26d4d55834c9915b4 /net/core | |
parent | cd7e1f0b056c071860db65c847a854b3093d6606 (diff) | |
parent | eab2ec83dbf0e32e28f3108f302ffdaa225d4cce (diff) |
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) | |||
543 | *groups++ = &netstat_group; | 543 | *groups++ = &netstat_group; |
544 | 544 | ||
545 | #ifdef CONFIG_WIRELESS_EXT_SYSFS | 545 | #ifdef CONFIG_WIRELESS_EXT_SYSFS |
546 | if (net->wireless_handlers || net->ieee80211_ptr) | 546 | if (net->ieee80211_ptr) |
547 | *groups++ = &wireless_group; | 547 | *groups++ = &wireless_group; |
548 | #ifdef CONFIG_WIRELESS_EXT | ||
549 | else if (net->wireless_handlers) | ||
550 | *groups++ = &wireless_group; | ||
551 | #endif | ||
548 | #endif | 552 | #endif |
549 | #endif /* CONFIG_SYSFS */ | 553 | #endif /* CONFIG_SYSFS */ |
550 | 554 | ||