From 650d40a3ae83e1ce1a3ddb933897b7d75f553b78 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 12 May 2009 13:17:42 +0000
Subject: [PATCH] [package] fix xsupplicant compilation failure against iwlib.h
 (#4937)

SVN-Revision: 15800
---
 .../patches/006-no_wireless_h.patch           | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 net/xsupplicant/patches/006-no_wireless_h.patch

diff --git a/net/xsupplicant/patches/006-no_wireless_h.patch b/net/xsupplicant/patches/006-no_wireless_h.patch
new file mode 100644
index 0000000000..8a9319318d
--- /dev/null
+++ b/net/xsupplicant/patches/006-no_wireless_h.patch
@@ -0,0 +1,84 @@
+diff -urN xsupplicant-1.2.8/configure xsupplicant-1.2.8.new/configure
+--- xsupplicant-1.2.8/configure	2009-05-12 15:12:47.000000000 +0200
++++ xsupplicant-1.2.8.new/configure	2009-05-12 15:13:29.000000000 +0200
+@@ -4764,7 +4764,6 @@
+    #include <linux/types.h>
+    #include <linux/if.h>
+    #endif
+-   #include <linux/wireless.h>
+ 
+ #include <$ac_header>
+ _ACEOF
+@@ -4833,7 +4832,6 @@
+ 		   #include <linux/types.h>
+ 		   #include <linux/if.h>
+ 		   #endif
+-                   #include <linux/wireless.h>
+                    #include <iwlib.h>
+ int
+ main ()
+diff -urN xsupplicant-1.2.8/configure.in xsupplicant-1.2.8.new/configure.in
+--- xsupplicant-1.2.8/configure.in	2009-05-12 15:12:47.000000000 +0200
++++ xsupplicant-1.2.8.new/configure.in	2009-05-12 15:13:57.000000000 +0200
+@@ -123,8 +123,7 @@
+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+    #include <linux/types.h>
+    #include <linux/if.h>
+-   #endif
+-   #include <linux/wireless.h>])
++   #endif])
+ 
+    AC_MSG_CHECKING([iwlib version])
+    AC_TRY_COMPILE([#define HEADERS_KERNEL
+@@ -137,7 +136,6 @@
+ 		   #include <linux/types.h>
+ 		   #include <linux/if.h>
+ 		   #endif
+-                   #include <linux/wireless.h>
+                    #include <iwlib.h>], 
+                [iw_extract_event_stream(NULL, NULL, 0);], [AC_DEFINE(NEW_IWLIB) AC_MSG_RESULT([3 params])], [AC_MSG_RESULT([2 params])])
+ fi
+diff -urN xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c xsupplicant-1.2.8.new/src/cardif/linux/cardif_atmel_driver.c
+--- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c	2009-05-12 15:12:47.000000000 +0200
++++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_atmel_driver.c	2009-05-12 15:14:30.000000000 +0200
+@@ -109,7 +109,6 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <stdint.h>
+-#include <linux/wireless.h>
+ 
+ #ifdef USE_EFENCE
+ #include <efence.h>
+diff -urN xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux.c
+--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c	2009-05-12 15:12:47.000000000 +0200
++++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux.c	2009-05-12 15:14:40.000000000 +0200
+@@ -180,7 +180,6 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <linux/rtnetlink.h>
+-#include <linux/wireless.h>
+ 
+ #include "xsupconfig.h"
+ #include "profile.h"
+diff -urN xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux_rtnetlink.c
+--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c	2009-05-12 15:12:47.000000000 +0200
++++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux_rtnetlink.c	2009-05-12 15:14:47.000000000 +0200
+@@ -210,7 +210,6 @@
+ #include <linux/if.h>
+ #include <linux/if_packet.h>
+ #include <math.h>
+-#include <linux/wireless.h>
+ 
+ #include "profile.h"
+ #include "xsupconfig.h"
+diff -urN xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux_wext.c
+--- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c	2009-05-12 15:12:47.000000000 +0200
++++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux_wext.c	2009-05-12 15:14:58.000000000 +0200
+@@ -204,7 +204,6 @@
+ #include <linux/types.h>
+ #include <linux/socket.h>
+ #include <linux/if.h>
+-#include <linux/wireless.h>
+ #include <iwlib.h>
+ #include <linux/if_packet.h>
+ #include <linux/netlink.h>
-- 
2.30.2