9126fec4d39f8ac1104bf9222acfec2e7e2a7b31
[openwrt/svn-archive/archive.git] / package / madwifi / patches / 371-wds_sta_separation.patch
1 --- a/net80211/ieee80211_input.c
2 +++ b/net80211/ieee80211_input.c
3 @@ -202,6 +202,7 @@
4 struct ieee80211com *ic = vap->iv_ic;
5 struct net_device *dev = vap->iv_dev;
6 struct ieee80211_node *ni_wds = NULL;
7 + struct net_device_stats *stats;
8 struct ieee80211_frame *wh;
9 struct ieee80211_key *key;
10 struct ether_header *eh;
11 @@ -562,11 +563,14 @@
12 if (ni_wds != NULL) {
13 ieee80211_unref_node(&ni);
14 ni = ieee80211_ref_node(ni_wds);
15 + } else if (!ni->ni_subif &&
16 + (vap->iv_flags_ext & IEEE80211_FEXT_WDSSEP)) {
17 + ieee80211_wds_addif(ni);
18 }
19 }
20
21 /* XXX: Useless node mgmt API; make better */
22 - if ((dir == IEEE80211_FC1_DIR_DSTODS) && !ni_wds) {
23 + if ((dir == IEEE80211_FC1_DIR_DSTODS) && !ni_wds && !ni->ni_subif) {
24 struct ieee80211_node_table *nt = &ic->ic_sta;
25 struct ieee80211_frame_addr4 *wh4;
26
27 @@ -698,8 +702,12 @@
28 if (! accept_data_frame(vap, ni, key, skb, eh))
29 goto out;
30
31 - vap->iv_devstats.rx_packets++;
32 - vap->iv_devstats.rx_bytes += skb->len;
33 + if (ni->ni_subif && ((eh)->ether_type != __constant_htons(ETHERTYPE_PAE)))
34 + stats = &ni->ni_subif->iv_devstats;
35 + else
36 + stats = &vap->iv_devstats;
37 + stats->rx_packets++;
38 + stats->rx_bytes += skb->len;
39 IEEE80211_NODE_STAT(ni, rx_data);
40 IEEE80211_NODE_STAT_ADD(ni, rx_bytes, skb->len);
41 ic->ic_lastdata = jiffies;
42 @@ -1132,6 +1140,13 @@
43 dev = vap->iv_xrvap->iv_dev;
44 #endif
45
46 + /* if the node has a wds subif, move data frames there,
47 + * but keep EAP traffic on the master */
48 + if (ni->ni_subif && ((eh)->ether_type != __constant_htons(ETHERTYPE_PAE))) {
49 + vap = ni->ni_subif;
50 + dev = vap->iv_dev;
51 + }
52 +
53 /* perform as a bridge within the vap */
54 /* XXX intra-vap bridging only */
55 if (vap->iv_opmode == IEEE80211_M_HOSTAP &&
56 @@ -1157,6 +1172,7 @@
57 if (ni1 != NULL) {
58 if (ni1->ni_vap == vap &&
59 ieee80211_node_is_authorized(ni1) &&
60 + !ni->ni_subif &&
61 ni1 != vap->iv_bss) {
62 skb1 = skb;
63 skb = NULL;
64 --- a/net80211/ieee80211_ioctl.h
65 +++ b/net80211/ieee80211_ioctl.h
66 @@ -649,6 +649,7 @@
67 IEEE80211_PARAM_BGSCAN_THRESH = 79, /* bg scan rssi threshold */
68 IEEE80211_PARAM_RSSI_DIS_THR = 80, /* rssi threshold for disconnection */
69 IEEE80211_PARAM_RSSI_DIS_COUNT = 81, /* counter for rssi threshold */
70 + IEEE80211_PARAM_WDS_SEP = 82, /* move wds stations into separate interfaces */
71 };
72
73 #define SIOCG80211STATS (SIOCDEVPRIVATE+2)
74 --- a/net80211/ieee80211_node.h
75 +++ b/net80211/ieee80211_node.h
76 @@ -92,11 +92,12 @@
77 * the ieee80211com structure.
78 */
79 struct ieee80211_node {
80 - struct ieee80211vap *ni_vap;
81 + struct ieee80211vap *ni_vap, *ni_subif;
82 struct ieee80211com *ni_ic;
83 struct ieee80211_node_table *ni_table;
84 TAILQ_ENTRY(ieee80211_node) ni_list;
85 LIST_ENTRY(ieee80211_node) ni_hash;
86 + struct work_struct ni_destroy; /* task for destroying a subif */
87 atomic_t ni_refcnt;
88 u_int ni_scangen; /* gen# for timeout scan */
89 u_int8_t ni_authmode; /* authentication algorithm */
90 @@ -430,5 +431,6 @@
91 void ieee80211_node_leave(struct ieee80211_node *);
92 u_int8_t ieee80211_getrssi(struct ieee80211com *);
93 int32_t ieee80211_get_node_count(struct ieee80211com *);
94 +void ieee80211_wds_addif(struct ieee80211_node *ni);
95 #endif /* _NET80211_IEEE80211_NODE_H_ */
96
97 --- a/net80211/ieee80211_var.h
98 +++ b/net80211/ieee80211_var.h
99 @@ -322,6 +322,7 @@
100 u_int8_t ic_myaddr[IEEE80211_ADDR_LEN];
101 struct timer_list ic_inact; /* mgmt/inactivity timer */
102
103 + unsigned int ic_subifs;
104 u_int32_t ic_flags; /* state flags */
105 u_int32_t ic_flags_ext; /* extension of state flags */
106 u_int32_t ic_caps; /* capabilities */
107 @@ -625,6 +626,7 @@
108 #define IEEE80211_FEXT_DROPUNENC_EAPOL 0x00000800 /* CONF: drop unencrypted eapol frames */
109 #define IEEE80211_FEXT_APPIE_UPDATE 0x00001000 /* STATE: beacon APP IE updated */
110 #define IEEE80211_FEXT_BGSCAN_THR 0x00002000 /* bgscan due to low rssi */
111 +#define IEEE80211_FEXT_WDSSEP 0x00004000 /* move wds clients into separate interfaces */
112
113 #define IEEE80211_COM_UAPSD_ENABLE(_ic) ((_ic)->ic_flags_ext |= IEEE80211_FEXT_UAPSD)
114 #define IEEE80211_COM_UAPSD_DISABLE(_ic) ((_ic)->ic_flags_ext &= ~IEEE80211_FEXT_UAPSD)
115 --- a/net80211/ieee80211_wireless.c
116 +++ b/net80211/ieee80211_wireless.c
117 @@ -2867,6 +2867,14 @@
118 else
119 vap->iv_minrateindex = 0;
120 break;
121 + case IEEE80211_PARAM_WDS_SEP:
122 + if (vap->iv_opmode != IEEE80211_M_HOSTAP)
123 + retv = -EINVAL;
124 + else if (value)
125 + vap->iv_flags_ext |= IEEE80211_FEXT_WDSSEP;
126 + else
127 + vap->iv_flags_ext &= ~IEEE80211_FEXT_WDSSEP;
128 + break;
129 #ifdef ATH_REVERSE_ENGINEERING
130 case IEEE80211_PARAM_DUMPREGS:
131 ieee80211_dump_registers(dev, info, w, extra);
132 @@ -3223,6 +3231,9 @@
133 case IEEE80211_PARAM_MINRATE:
134 param[0] = vap->iv_minrateindex;
135 break;
136 + case IEEE80211_PARAM_WDS_SEP:
137 + param[0] = !!(vap->iv_flags_ext & IEEE80211_FEXT_WDSSEP);
138 + break;
139 default:
140 return -EOPNOTSUPP;
141 }
142 @@ -5767,6 +5778,10 @@
143 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_minrate"},
144 { IEEE80211_IOCTL_SETSCANLIST,
145 IW_PRIV_TYPE_CHAR | 255, 0, "setscanlist"},
146 + { IEEE80211_PARAM_WDS_SEP,
147 + IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "wdssep"},
148 + { IEEE80211_PARAM_WDS_SEP,
149 + 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_wdssep"},
150
151 #ifdef ATH_REVERSE_ENGINEERING
152 /*
153 --- a/net80211/ieee80211_node.c
154 +++ b/net80211/ieee80211_node.c
155 @@ -47,6 +47,7 @@
156 #include <linux/netdevice.h>
157 #include <linux/etherdevice.h>
158 #include <linux/random.h>
159 +#include <linux/rtnetlink.h>
160
161 #include "if_media.h"
162
163 @@ -236,7 +237,11 @@
164 ieee80211_node_vdetach(struct ieee80211vap *vap)
165 {
166 struct ieee80211com *ic = vap->iv_ic;
167 + struct ieee80211_node *ni;
168
169 + ni = vap->iv_wdsnode;
170 + if (ni)
171 + ni->ni_subif = NULL;
172 ieee80211_node_table_reset(&ic->ic_sta, vap);
173 if (vap->iv_bss != NULL) {
174 ieee80211_unref_node(&vap->iv_bss);
175 @@ -1134,6 +1139,40 @@
176 return ni;
177 }
178
179 +#define WDSIFNAME ".sta%d"
180 +void ieee80211_wds_addif(struct ieee80211_node *ni)
181 +{
182 + struct ieee80211vap *vap = ni->ni_vap;
183 + struct ieee80211com *ic = vap->iv_ic;
184 + struct ieee80211vap *avp;
185 + char *name;
186 +
187 + /* check if the node is split out already */
188 + if (ni->ni_subif)
189 + return;
190 +
191 + name = kmalloc(strlen(vap->iv_dev->name) + sizeof(WDSIFNAME) + 1, GFP_KERNEL);
192 + if (!name)
193 + return;
194 +
195 + strcpy(name, vap->iv_dev->name);
196 + strcat(name, WDSIFNAME);
197 + rtnl_lock();
198 + avp = ieee80211_create_vap(ic, name, ic->ic_dev, IEEE80211_M_WDS, 0, vap);
199 + kfree(name);
200 + if (!avp)
201 + goto done;
202 +
203 + memcpy(avp->wds_mac, ni->ni_bssid, IEEE80211_ADDR_LEN);
204 + avp->iv_wdsnode = ieee80211_ref_node(ni);
205 + ni->ni_subif = avp;
206 + ic->ic_subifs++;
207 +
208 +done:
209 + rtnl_unlock();
210 +}
211 +#undef WDSIFNAME
212 +
213 /* Add wds address to the node table */
214 int
215 #ifdef IEEE80211_DEBUG_REFCNT
216 @@ -2254,6 +2293,28 @@
217 }
218 }
219
220 +static void
221 +ieee80211_subif_destroy(struct work_struct *work)
222 +{
223 + struct ieee80211_node *ni = container_of(work, struct ieee80211_node, ni_destroy);
224 + struct ieee80211vap *vap = ni->ni_subif;
225 + struct ieee80211com *ic;
226 +
227 + if (!vap)
228 + goto done;
229 +
230 + rtnl_lock();
231 + ic = vap->iv_ic;
232 + ni->ni_subif = NULL;
233 + ieee80211_stop(vap->iv_dev);
234 + ic->ic_vap_delete(vap);
235 + ic->ic_subifs--;
236 + rtnl_unlock();
237 +
238 +done:
239 + ieee80211_unref_node(&ni);
240 +}
241 +
242 /*
243 * Handle bookkeeping for a station/neighbor leaving
244 * the bss when operating in ap or adhoc modes.
245 @@ -2270,6 +2331,12 @@
246 ni, "station with aid %d leaves (refcnt %u)",
247 IEEE80211_NODE_AID(ni), atomic_read(&ni->ni_refcnt));
248
249 + if (ni->ni_subif) {
250 + ieee80211_ref_node(ni);
251 + IEEE80211_INIT_WORK(&ni->ni_destroy, ieee80211_subif_destroy);
252 + schedule_work(&ni->ni_destroy);
253 + }
254 +
255 /* From this point onwards we can no longer find the node,
256 * so no more references are generated
257 */
258 --- a/net80211/ieee80211_linux.h
259 +++ b/net80211/ieee80211_linux.h
260 @@ -81,6 +81,12 @@
261 #endif
262 }
263
264 +#ifndef container_of
265 +#define container_of(ptr, type, member) ({ \
266 + const typeof( ((type *)0)->member ) *__mptr = (ptr); \
267 + (type *)( (char *)__mptr - offsetof(type,member) );})
268 +#endif
269 +
270 /*
271 * Task deferral
272 *
273 @@ -113,6 +119,29 @@
274
275 #define IEEE80211_RESCHEDULE schedule
276
277 +#include <linux/sched.h>
278 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,41)
279 +#include <linux/tqueue.h>
280 +#define work_struct tq_struct
281 +#define schedule_work(t) schedule_task((t))
282 +#define flush_scheduled_work() flush_scheduled_tasks()
283 +#define IEEE80211_INIT_WORK(t, f) do { \
284 + memset((t), 0, sizeof(struct tq_struct)); \
285 + (t)->routine = (void (*)(void*)) (f); \
286 + (t)->data=(void *) (t); \
287 +} while (0)
288 +#else
289 +#include <linux/workqueue.h>
290 +
291 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
292 +#define IEEE80211_INIT_WORK(_t, _f) INIT_WORK((_t), (void (*)(void *))(_f), (_t));
293 +#else
294 +#define IEEE80211_INIT_WORK(_t, _f) INIT_WORK((_t), (_f));
295 +#endif
296 +
297 +#endif /* KERNEL_VERSION < 2.5.41 */
298 +
299 +
300 /* Locking */
301 /* NB: beware, spin_is_locked() is not usefully defined for !(DEBUG || SMP)
302 * because spinlocks do not exist in this configuration. Instead IRQs
303 @@ -167,6 +196,18 @@
304 IEEE80211_VAPS_LOCK_ASSERT(_ic); \
305 spin_unlock_bh(&(_ic)->ic_vapslock); \
306 } while (0)
307 +#define IEEE80211_VAPS_LOCK_IRQ(_ic) do { \
308 + unsigned long __vlockflags; \
309 + IEEE80211_VAPS_LOCK_CHECK(_ic); \
310 + spin_lock_irqsave(&(_ic)->ic_vapslock, __vlockflags);
311 +#define IEEE80211_VAPS_UNLOCK_IRQ(_ic) \
312 + IEEE80211_VAPS_LOCK_ASSERT(_ic); \
313 + spin_unlock_irqrestore(&(_ic)->ic_vapslock, __vlockflags); \
314 +} while (0)
315 +#define IEEE80211_VAPS_UNLOCK_IRQ_EARLY(_ic) \
316 + IEEE80211_VAPS_LOCK_ASSERT(_ic); \
317 + spin_unlock_irqrestore(&(_ic)->ic_vapslock, __vlockflags);
318 +
319
320 #if (defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)) && defined(spin_is_locked)
321 #define IEEE80211_VAPS_LOCK_ASSERT(_ic) \
322 --- a/net80211/ieee80211_proto.c
323 +++ b/net80211/ieee80211_proto.c
324 @@ -1081,6 +1081,8 @@
325 int
326 ieee80211_open(struct net_device *dev)
327 {
328 + struct ieee80211vap *vap = dev->priv;
329 +
330 return ieee80211_init(dev, 0);
331 }
332
333 @@ -1116,11 +1118,33 @@
334 struct ieee80211vap *vap = dev->priv;
335 struct ieee80211com *ic = vap->iv_ic;
336 struct net_device *parent = ic->ic_dev;
337 + struct ieee80211_node *tni, *ni;
338
339 IEEE80211_DPRINTF(vap,
340 IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG,
341 "%s\n", "stop running");
342
343 + /* get rid of all wds nodes while we're still locked */
344 + do {
345 + ni = NULL;
346 +
347 + IEEE80211_NODE_TABLE_LOCK_IRQ(&ic->ic_sta);
348 + TAILQ_FOREACH(tni, &ic->ic_sta.nt_node, ni_list) {
349 + if (tni->ni_vap != vap)
350 + continue;
351 + if (!tni->ni_subif)
352 + continue;
353 + ni = tni;
354 + break;
355 + }
356 + IEEE80211_NODE_TABLE_UNLOCK_IRQ(&ic->ic_sta);
357 +
358 + if (!ni)
359 + break;
360 +
361 + ieee80211_node_leave(ni);
362 + } while (1);
363 +
364 ieee80211_new_state(vap, IEEE80211_S_INIT, -1);
365 if (dev->flags & IFF_RUNNING) {
366 dev->flags &= ~IFF_RUNNING; /* mark us stopped */
367 @@ -1342,9 +1366,9 @@
368 struct ieee80211com *ic = vap->iv_ic;
369 int rc;
370
371 - IEEE80211_VAPS_LOCK_BH(ic);
372 + IEEE80211_VAPS_LOCK_IRQ(ic);
373 rc = vap->iv_newstate(vap, nstate, arg);
374 - IEEE80211_VAPS_UNLOCK_BH(ic);
375 + IEEE80211_VAPS_UNLOCK_IRQ(ic);
376 return rc;
377 }
378
379 --- a/net80211/ieee80211.c
380 +++ b/net80211/ieee80211.c
381 @@ -599,8 +599,10 @@
382
383 IEEE80211_CANCEL_TQUEUE(&vap->iv_stajoin1tq);
384 IEEE80211_LOCK_IRQ(ic);
385 - if (vap->iv_wdsnode)
386 + if (vap->iv_wdsnode) {
387 + vap->iv_wdsnode->ni_subif = NULL;
388 ieee80211_unref_node(&vap->iv_wdsnode);
389 + }
390 if ((vap->iv_opmode == IEEE80211_M_WDS) &&
391 (vap->iv_master != NULL))
392 TAILQ_REMOVE(&vap->iv_master->iv_wdslinks, vap, iv_wdsnext);
393 --- a/ath/if_athvar.h
394 +++ b/ath/if_athvar.h
395 @@ -79,28 +79,6 @@
396 #define tasklet_enable(t) do { (void) t; local_bh_enable(); } while (0)
397 #endif /* !DECLARE_TASKLET */
398
399 -#include <linux/sched.h>
400 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,41)
401 -#include <linux/tqueue.h>
402 -#define work_struct tq_struct
403 -#define schedule_work(t) schedule_task((t))
404 -#define flush_scheduled_work() flush_scheduled_tasks()
405 -#define ATH_INIT_WORK(t, f) do { \
406 - memset((t), 0, sizeof(struct tq_struct)); \
407 - (t)->routine = (void (*)(void*)) (f); \
408 - (t)->data=(void *) (t); \
409 -} while (0)
410 -#else
411 -#include <linux/workqueue.h>
412 -
413 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
414 -#define ATH_INIT_WORK(_t, _f) INIT_WORK((_t), (void (*)(void *))(_f), (_t));
415 -#else
416 -#define ATH_INIT_WORK(_t, _f) INIT_WORK((_t), (_f));
417 -#endif
418 -
419 -#endif /* KERNEL_VERSION < 2.5.41 */
420 -
421 /*
422 * Guess how the interrupt handler should work.
423 */
424 --- a/net80211/ieee80211_output.c
425 +++ b/net80211/ieee80211_output.c
426 @@ -786,6 +786,8 @@
427 hdrsize = sizeof(struct ieee80211_frame);
428
429 SKB_CB(skb)->auth_pkt = (eh.ether_type == __constant_htons(ETHERTYPE_PAE));
430 + if (!SKB_CB(skb)->auth_pkt && ni->ni_subif)
431 + vap = ni->ni_subif;
432
433 switch (vap->iv_opmode) {
434 case IEEE80211_M_IBSS: