/[gentoo-x86]/net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-r1-linux-2.6.29.patch
Gentoo

Contents of /net-wireless/broadcom-sta/files/broadcom-sta-5.10.91.9-r1-linux-2.6.29.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Tue Oct 20 13:36:08 2009 UTC (9 years, 1 month ago) by matsuu
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Added PROPERTIES="interactive", bug #288831.
(Portage version: 2.1.6.13/cvs/Linux x86_64)

1 diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_iw.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_iw.c
2 --- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_iw.c 2009-04-23 02:46:35.000000000 +0900
3 +++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_iw.c 2009-05-08 00:42:45.000000000 +0900
4 @@ -610,7 +610,11 @@
5 char *extra
6 )
7 {
8 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
9 + wl_iw_t *iw = netdev_priv(dev);
10 +#else
11 wl_iw_t *iw = dev->priv;
12 +#endif
13 struct sockaddr *addr = (struct sockaddr *) extra;
14 int i;
15
16 @@ -635,7 +639,11 @@
17 char *extra
18 )
19 {
20 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
21 + wl_iw_t *iw = netdev_priv(dev);
22 +#else
23 wl_iw_t *iw = dev->priv;
24 +#endif
25 struct sockaddr *addr = (struct sockaddr *) extra;
26 struct iw_quality *qual = (struct iw_quality *) &addr[iw->spy_num];
27 int i;
28 @@ -1110,7 +1118,11 @@
29 char *extra
30 )
31 {
32 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
33 + wl_iw_t *iw = netdev_priv(dev);
34 +#else
35 wl_iw_t *iw = dev->priv;
36 +#endif
37
38 WL_TRACE(("%s: SIOCSIWNICKN\n", dev->name));
39
40 @@ -1134,7 +1146,11 @@
41 char *extra
42 )
43 {
44 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
45 + wl_iw_t *iw = netdev_priv(dev);
46 +#else
47 wl_iw_t *iw = dev->priv;
48 +#endif
49
50 WL_TRACE(("%s: SIOCGIWNICKN\n", dev->name));
51
52 @@ -1790,7 +1806,11 @@
53 int paramid;
54 int paramval;
55 int val = 0;
56 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
57 + wl_iw_t *iw = netdev_priv(dev);
58 +#else
59 wl_iw_t *iw = dev->priv;
60 +#endif
61
62 WL_TRACE(("%s: SIOCSIWAUTH\n", dev->name));
63
64 @@ -1921,7 +1941,11 @@
65 int paramid;
66 int paramval = 0;
67 int val;
68 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
69 + wl_iw_t *iw = netdev_priv(dev);
70 +#else
71 wl_iw_t *iw = dev->priv;
72 +#endif
73
74 WL_TRACE(("%s: SIOCGIWAUTH\n", dev->name));
75
76 diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c
77 --- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c 2009-04-23 02:48:59.000000000 +0900
78 +++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c 2009-05-08 00:45:29.000000000 +0900
79 @@ -53,6 +53,9 @@
80 #include <linux/pci_ids.h>
81 #define WLC_MAXBSSCFG 1
82
83 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
84 +#include <net/lib80211.h>
85 +#endif
86 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
87 #include <net/ieee80211.h>
88 #endif
89 @@ -130,7 +133,11 @@
90 u8 rx_hdr[16], tx_hdr[16];
91 };
92
93 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
94 +#define WL_DEV_IF(dev) ((wl_if_t*)netdev_priv(dev))
95 +#else
96 #define WL_DEV_IF(dev) ((wl_if_t*)(dev)->priv)
97 +#endif
98 #define WL_INFO(dev) ((wl_info_t*)(WL_DEV_IF(dev)->wl))
99
100 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
101 @@ -282,6 +289,9 @@
102 dev = wlif->dev;
103 wl->dev = dev;
104 wl_if_setup(dev);
105 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
106 + wlif = netdev_priv(dev);
107 +#endif
108
109 dev->base_addr = regs;
110
111 @@ -359,10 +369,20 @@
112
113 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
114
115 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
116 + wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
117 +#else
118 wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
119 +#endif
120 if (wl->tkipmodops == NULL) {
121 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
122 + request_module("lib80211");
123 + request_module("lib80211_crypt_tkip");
124 + wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
125 +#else
126 request_module("ieee80211_crypt_tkip");
127 wl->tkipmodops = ieee80211_get_crypto_ops("TKIP");
128 +#endif
129 }
130 #endif
131 #ifdef CONFIG_WIRELESS_EXT
132 @@ -666,7 +686,11 @@
133 }
134
135 if (wl->monitor) {
136 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
137 + wl_free_if(wl, (wl_if_t *)netdev_priv(wl->monitor));
138 +#else
139 wl_free_if(wl, (wl_if_t *)(wl->monitor->priv));
140 +#endif
141 wl->monitor = NULL;
142 }
143
144 @@ -833,7 +857,10 @@
145 strncpy(dev->name, name, IFNAMSIZ);
146 #else
147
148 - dev = alloc_netdev(0, name, ether_setup);
149 + dev = alloc_netdev(sizeof(wl_if_t), name, ether_setup);
150 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
151 + wlif = netdev_priv(dev);
152 +#endif
153 if (!dev) {
154 MFREE(wl->osh, wlif, sizeof(wl_if_t));
155 WL_ERROR(("wl%d: wl_alloc_if: out of memory, alloc_netdev\n",
156 @@ -847,7 +874,9 @@
157 wlif->wl = wl;
158 wlif->wlcif = wlcif;
159 wlif->subunit = subunit;
160 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
161 dev->priv = wlif;
162 +#endif
163
164 if (iftype != WL_IFTYPE_MON && wl->dev && netif_queue_stopped(wl->dev))
165 netif_stop_queue(dev);
166 diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.h hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.h
167 --- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.h 2009-04-23 02:49:04.000000000 +0900
168 +++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.h 2009-05-08 00:42:45.000000000 +0900
169 @@ -85,10 +85,16 @@
170 bool resched;
171 uint32 pci_psstate[16];
172 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
173 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
174 + struct lib80211_crypto_ops *tkipmodops;
175 + struct lib80211_tkip_data *tkip_ucast_data;
176 + struct lib80211_tkip_data *tkip_bcast_data;
177 +#else
178 struct ieee80211_crypto_ops *tkipmodops;
179 struct ieee80211_tkip_data *tkip_ucast_data;
180 struct ieee80211_tkip_data *tkip_bcast_data;
181 #endif
182 +#endif
183
184 uint stats_id;
185

  ViewVC Help
Powered by ViewVC 1.1.20