From: Johannes Berg <[EMAIL PROTECTED]>
This fixes compilation with d80211/cfg80211/wireless ext.
Signed-off-by: Johannes Berg <[EMAIL PROTECTED]>
Signed-off-by: Jiri Benc <[EMAIL PROTECTED]>
--- linux-2.6-git.orig/net/core/net-sysfs.c 2006-12-06 12:31:04.247283692
+0100
+++ linux-2.6-git/net/core/net-sysfs.c 2006-12-06 12:31:11.865215130 +0100
@@ -329,7 +329,7 @@
.attrs = netstat_attrs,
};
-#ifdef WIRELESS_EXT
+#ifdef CONFIG_WIRELESS_EXT
/* helper function that does all the locking etc for wireless stats */
static ssize_t wireless_show(struct class_device *cd, char *buf,
ssize_t (*format)(const struct iw_statistics *,
@@ -462,7 +462,7 @@
if (net->get_stats)
*groups++ = &netstat_group;
-#ifdef WIRELESS_EXT
+#ifdef CONFIG_WIRELESS_EXT
if (net->wireless_handlers &&
net->wireless_handlers->get_wireless_stats)
*groups++ = &wireless_group;
#endif
--- linux-2.6-git.orig/net/d80211/Kconfig 2006-12-06 12:31:58.903791779
+0100
+++ linux-2.6-git/net/d80211/Kconfig 2006-12-06 12:32:07.355715711 +0100
@@ -3,6 +3,7 @@
select CRYPTO
select CRYPTO_ARC4
select CRYPTO_AES
+ select WIRELESS_EXT
---help---
This option enables the hardware independent IEEE 802.11
networking stack.
--- linux-2.6-git.orig/net/wireless/Makefile 2006-12-06 12:35:58.838632346
+0100
+++ linux-2.6-git/net/wireless/Makefile 2006-12-06 12:36:03.541590019 +0100
@@ -12,5 +12,5 @@
# this needs to be compiled in...
obj-$(CONFIG_CFG80211_WEXT_COMPAT) += wext-compat.o
-obj-$(CONFIG_CFG80211_WEXTNL_COMPAT)$(CONFIG_NET_WIRELESS) += wext-common.o
+obj-$(CONFIG_CFG80211_WEXT_COMPAT)$(CONFIG_NET_WIRELESS) += wext-common.o
obj-y += $(obj-yy) $(obj-yn) $(obj-ny)
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
