rpms/kernel/devel linux-2.6-wireless-revert-22182283.patch, NONE, 1.1 kernel.spec, 1.668, 1.669

[John W. Linville (linville)]

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20117

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-wireless-revert-22182283.patch 
Log Message:
Revert misguided wireless.h "fix" from upstream

linux-2.6-wireless-revert-22182283.patch:

--- NEW FILE linux-2.6-wireless-revert-22182283.patch ---
commit 8f2500b1b2240282ba1452a79e29437f8e47d537
Author: John W. Linville <linville at tuxdriver.com>
Date:   Mon Jun 2 14:30:39 2008 -0400

    Revert "Make linux/wireless.h be able to compile"
    
    This reverts commit 2218228392080f0ca2fc2974604e79f57b12c436.
    
    I must have let this slip through because it claimed to fix a compile
    failure.  Upon further review, I think it was a mistake to merge it in
    the first place.
    
    Signed-off-by: John W. Linville <linville at tuxdriver.com>

diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index 0a9b5b4..2864b16 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -69,9 +69,14 @@
 
 /***************************** INCLUDES *****************************/
 
-#include <linux/types.h>		/* for __u* and __s* typedefs */
+/* This header is used in user-space, therefore need to be sanitised
+ * for that purpose. Those includes are usually not compatible with glibc.
+ * To know which includes to use in user-space, check iwlib.h. */
+#ifdef __KERNEL__
+#include <linux/types.h>		/* for "caddr_t" et al		*/
 #include <linux/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
+#endif	/* __KERNEL__ */
 
 /***************************** VERSION *****************************/
 /*


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.668
retrieving revision 1.669
diff -u -r1.668 -r1.669
--- kernel.spec	29 May 2008 18:04:14 -0000	1.668
+++ kernel.spec	2 Jun 2008 18:54:59 -0000	1.669
@@ -611,6 +611,7 @@
 
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
+Patch682: linux-2.6-wireless-revert-22182283.patch
 Patch690: linux-2.6-at76.patch
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
@@ -1134,6 +1135,8 @@
 ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.27
 ApplyPatch linux-2.6-wireless-pending.patch
+# revert misguided commit 2218228392080f0ca2fc2974604e79f57b12c436
+ApplyPatch linux-2.6-wireless-revert-22182283.patch
 
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
@@ -1776,6 +1779,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Jun 02 2008 John W. Linville <linville at redhat.com>
+- Revert misguided wireless.h "fix" from upstream
+
 * Thu May 29 2008 John W. Linville <linville at redhat.com>
 - Upstream wireless fixes from 2008-05-28
   (http://marc.info/?l=linux-wireless&m=121201250110162&w=2)