rpms/kernel/FC-6 jwltest-d80211-backport-fixup.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.2855.2.1, 1.2855.2.2

[fedora-cvs-commits at redhat.com]

Author: linville

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv28271

Modified Files:
      Tag: private-linville-jwltest-fc6-13-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc6-13-branch
	jwltest-d80211-backport-fixup.patch 
Log Message:


jwltest-d80211-backport-fixup.patch:
 net-sysfs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE jwltest-d80211-backport-fixup.patch ---
--- linux-2.6.18.noarch/net/core/net-sysfs.c.orig	2006-11-20 20:12:26.000000000 -0500
+++ linux-2.6.18.noarch/net/core/net-sysfs.c	2006-11-20 20:12:39.000000000 -0500
@@ -329,7 +329,7 @@ static struct attribute_group netstat_gr
 	.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 *,
@@ -464,7 +464,7 @@ int netdev_register_sysfs(struct net_dev
 	if (net->get_stats)
 		*groups++ = &netstat_group;
 
-#ifdef WIRELESS_EXT
+#ifdef CONFIG_WIRELESS_EXT
 	if (net->get_wireless_stats
 	    || (net->wireless_handlers && net->wireless_handlers->get_wireless_stats))
 		*groups++ = &wireless_group;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2855.2.1
retrieving revision 1.2855.2.2
diff -u -r1.2855.2.1 -r1.2855.2.2
--- kernel-2.6.spec	20 Nov 2006 21:55:17 -0000	1.2855.2.1
+++ kernel-2.6.spec	21 Nov 2006 01:15:05 -0000	1.2855.2.2
@@ -574,6 +574,7 @@
 # d80211 backpaort
 #
 Patch6000: jwltest-d80211-backport.patch
+Patch6001: jwltest-d80211-backport-fixup.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -1279,7 +1280,10 @@
 #
 # final stuff
 #
+
+# d80211 stuff
 %patch6000 -p1
+%patch6001 -p1
 
 #
 # misc small stuff to make things compile or otherwise improve performance