/[gentoo-x86]/net-wireless/rtl8180/files/rtl8180-2.6.19.patch
Gentoo

Contents of /net-wireless/rtl8180/files/rtl8180-2.6.19.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download) (as text)
Wed May 9 20:15:51 2007 UTC (12 years, 11 months ago) by genstef
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
Fix for newer kernels thanks to many people in bug 160058
(Portage version: 2.1.2.7)

1 diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_crypt.c rtl8180-0.22_pre20050528/ieee80211_crypt.c
2 --- rtl8180-0.22_pre20050528.orig/ieee80211_crypt.c 2006-02-15 21:52:10.000000000 +0100
3 +++ rtl8180-0.22_pre20050528/ieee80211_crypt.c 2006-12-25 11:31:18.000000000 +0100
4 @@ -11,8 +11,12 @@
5 *
6 */
7 #ifndef CONFIG_IEEE80211_NOWEP
8 -#include <linux/config.h>
9 #include <linux/version.h>
10 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
11 + #include <linux/config.h>
12 +#else
13 + #include <linux/autoconf.h>
14 +#endif
15 #include <linux/module.h>
16 #include <linux/init.h>
17 #include <linux/slab.h>
18 diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_crypt_wep.c rtl8180-0.22_pre20050528/ieee80211_crypt_wep.c
19 --- rtl8180-0.22_pre20050528.orig/ieee80211_crypt_wep.c 2006-02-15 21:52:10.000000000 +0100
20 +++ rtl8180-0.22_pre20050528/ieee80211_crypt_wep.c 2006-12-25 11:31:18.000000000 +0100
21 @@ -12,8 +12,12 @@
22 * someoneelse-
23 */
24 #ifndef CONFIG_IEEE80211_NOWEP
25 -#include <linux/config.h>
26 #include <linux/version.h>
27 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
28 + #include <linux/config.h>
29 +#else
30 + #include <linux/autoconf.h>
31 +#endif
32 #include <linux/module.h>
33 #include <linux/init.h>
34 #include <linux/slab.h>
35 diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_module.c rtl8180-0.22_pre20050528/ieee80211_module.c
36 --- rtl8180-0.22_pre20050528.orig/ieee80211_module.c 2006-02-15 21:52:10.000000000 +0100
37 +++ rtl8180-0.22_pre20050528/ieee80211_module.c 2006-12-25 11:31:18.000000000 +0100
38 @@ -38,7 +38,12 @@
39 *******************************************************************************/
40 #include <linux/init.h>
41 #include <linux/compiler.h>
42 -#include <linux/config.h>
43 +#include <linux/version.h>
44 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
45 + #include <linux/config.h>
46 +#else
47 + #include <linux/autoconf.h>
48 +#endif
49 #include <linux/errno.h>
50 #include <linux/if_arp.h>
51 #include <linux/in6.h>
52 @@ -53,7 +58,6 @@
53 #include <linux/slab.h>
54 #include <linux/tcp.h>
55 #include <linux/types.h>
56 -#include <linux/version.h>
57 #include <linux/wireless.h>
58 #include <linux/etherdevice.h>
59 #include <asm/uaccess.h>
60 diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_rx.c rtl8180-0.22_pre20050528/ieee80211_rx.c
61 --- rtl8180-0.22_pre20050528.orig/ieee80211_rx.c 2006-02-15 21:52:10.000000000 +0100
62 +++ rtl8180-0.22_pre20050528/ieee80211_rx.c 2006-12-25 11:31:18.000000000 +0100
63 @@ -17,7 +17,12 @@
64 */
65
66 #include <linux/compiler.h>
67 -#include <linux/config.h>
68 +#include <linux/version.h>
69 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
70 + #include <linux/config.h>
71 +#else
72 + #include <linux/autoconf.h>
73 +#endif
74 #include <linux/errno.h>
75 #include <linux/if_arp.h>
76 #include <linux/in6.h>
77 @@ -32,7 +37,6 @@
78 #include <linux/slab.h>
79 #include <linux/tcp.h>
80 #include <linux/types.h>
81 -#include <linux/version.h>
82 #include <linux/wireless.h>
83 #include <linux/etherdevice.h>
84 #include <asm/uaccess.h>
85 diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_tx.c rtl8180-0.22_pre20050528/ieee80211_tx.c
86 --- rtl8180-0.22_pre20050528.orig/ieee80211_tx.c 2006-02-15 21:52:10.000000000 +0100
87 +++ rtl8180-0.22_pre20050528/ieee80211_tx.c 2006-12-25 11:31:18.000000000 +0100
88 @@ -31,7 +31,12 @@
89
90 ******************************************************************************/
91 #include <linux/compiler.h>
92 -#include <linux/config.h>
93 +#include <linux/version.h>
94 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
95 + #include <linux/config.h>
96 +#else
97 + #include <linux/autoconf.h>
98 +#endif
99 #include <linux/errno.h>
100 #include <linux/if_arp.h>
101 #include <linux/in6.h>
102 @@ -46,7 +51,6 @@
103 #include <linux/slab.h>
104 #include <linux/tcp.h>
105 #include <linux/types.h>
106 -#include <linux/version.h>
107 #include <linux/wireless.h>
108 #include <linux/etherdevice.h>
109 #include <asm/uaccess.h>
110 diff -Nurp rtl8180-0.22_pre20050528.orig/r8180_core.c rtl8180-0.22_pre20050528/r8180_core.c
111 --- rtl8180-0.22_pre20050528.orig/r8180_core.c 2006-12-25 11:20:09.000000000 +0100
112 +++ rtl8180-0.22_pre20050528/r8180_core.c 2006-12-25 11:32:04.000000000 +0100
113 @@ -4038,7 +4038,14 @@ static int __devinit rtl8180_pci_probe(s
114 dev->do_ioctl = do_ioctl;
115 dev->set_multicast_list = r8180_set_multicast;
116 dev->set_mac_address = r8180_set_mac_adr;
117 - dev->get_wireless_stats = r8180_get_wireless_stats;
118 +
119 +#if WIRELESS_EXT >= 12
120 +#if WIRELESS_EXT < 17
121 + dev->get_wireless_stats = r8180_get_wireless_stats;
122 +#endif
123 + dev->wireless_handlers = (struct iw_handler_def *) &r8180_wx_handlers_def;
124 +#endif
125 +
126 dev->type=ARPHRD_ETHER;
127
128 if (dev_alloc_name(dev, ifname) < 0){
129 diff -Nurp rtl8180-0.22_pre20050528.orig/r8180.h rtl8180-0.22_pre20050528/r8180.h
130 --- rtl8180-0.22_pre20050528.orig/r8180.h 2006-02-15 21:52:10.000000000 +0100
131 +++ rtl8180-0.22_pre20050528/r8180.h 2006-12-25 11:31:18.000000000 +0100
132 @@ -26,7 +26,12 @@
133
134 #include <linux/module.h>
135 #include <linux/kernel.h>
136 -#include <linux/config.h>
137 +#include <linux/version.h>
138 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
139 + #include <linux/config.h>
140 +#else
141 + #include <linux/autoconf.h>
142 +#endif
143 #include <linux/init.h>
144 #include <linux/ioport.h>
145 #include <linux/sched.h>

  ViewVC Help
Powered by ViewVC 1.1.20