[package] fix xsupplicant compilation failure against iwlib.h (#4937)
[openwrt/svn-archive/archive.git] / net / xsupplicant / patches / 006-no_wireless_h.patch
1 diff -urN xsupplicant-1.2.8/configure xsupplicant-1.2.8.new/configure
2 --- xsupplicant-1.2.8/configure 2009-05-12 15:12:47.000000000 +0200
3 +++ xsupplicant-1.2.8.new/configure 2009-05-12 15:13:29.000000000 +0200
4 @@ -4764,7 +4764,6 @@
5 #include <linux/types.h>
6 #include <linux/if.h>
7 #endif
8 - #include <linux/wireless.h>
9
10 #include <$ac_header>
11 _ACEOF
12 @@ -4833,7 +4832,6 @@
13 #include <linux/types.h>
14 #include <linux/if.h>
15 #endif
16 - #include <linux/wireless.h>
17 #include <iwlib.h>
18 int
19 main ()
20 diff -urN xsupplicant-1.2.8/configure.in xsupplicant-1.2.8.new/configure.in
21 --- xsupplicant-1.2.8/configure.in 2009-05-12 15:12:47.000000000 +0200
22 +++ xsupplicant-1.2.8.new/configure.in 2009-05-12 15:13:57.000000000 +0200
23 @@ -123,8 +123,7 @@
24 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
25 #include <linux/types.h>
26 #include <linux/if.h>
27 - #endif
28 - #include <linux/wireless.h>])
29 + #endif])
30
31 AC_MSG_CHECKING([iwlib version])
32 AC_TRY_COMPILE([#define HEADERS_KERNEL
33 @@ -137,7 +136,6 @@
34 #include <linux/types.h>
35 #include <linux/if.h>
36 #endif
37 - #include <linux/wireless.h>
38 #include <iwlib.h>],
39 [iw_extract_event_stream(NULL, NULL, 0);], [AC_DEFINE(NEW_IWLIB) AC_MSG_RESULT([3 params])], [AC_MSG_RESULT([2 params])])
40 fi
41 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
42 --- xsupplicant-1.2.8/src/cardif/linux/cardif_atmel_driver.c 2009-05-12 15:12:47.000000000 +0200
43 +++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_atmel_driver.c 2009-05-12 15:14:30.000000000 +0200
44 @@ -109,7 +109,6 @@
45 #include <unistd.h>
46 #include <errno.h>
47 #include <stdint.h>
48 -#include <linux/wireless.h>
49
50 #ifdef USE_EFENCE
51 #include <efence.h>
52 diff -urN xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux.c
53 --- xsupplicant-1.2.8/src/cardif/linux/cardif_linux.c 2009-05-12 15:12:47.000000000 +0200
54 +++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux.c 2009-05-12 15:14:40.000000000 +0200
55 @@ -180,7 +180,6 @@
56 #include <errno.h>
57 #include <unistd.h>
58 #include <linux/rtnetlink.h>
59 -#include <linux/wireless.h>
60
61 #include "xsupconfig.h"
62 #include "profile.h"
63 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
64 --- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_rtnetlink.c 2009-05-12 15:12:47.000000000 +0200
65 +++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux_rtnetlink.c 2009-05-12 15:14:47.000000000 +0200
66 @@ -210,7 +210,6 @@
67 #include <linux/if.h>
68 #include <linux/if_packet.h>
69 #include <math.h>
70 -#include <linux/wireless.h>
71
72 #include "profile.h"
73 #include "xsupconfig.h"
74 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
75 --- xsupplicant-1.2.8/src/cardif/linux/cardif_linux_wext.c 2009-05-12 15:12:47.000000000 +0200
76 +++ xsupplicant-1.2.8.new/src/cardif/linux/cardif_linux_wext.c 2009-05-12 15:14:58.000000000 +0200
77 @@ -204,7 +204,6 @@
78 #include <linux/types.h>
79 #include <linux/socket.h>
80 #include <linux/if.h>
81 -#include <linux/wireless.h>
82 #include <iwlib.h>
83 #include <linux/if_packet.h>
84 #include <linux/netlink.h>