remove a wrong patch chunk in the madwifi update
[openwrt/openwrt.git] / package / madwifi / patches-r3776 / 303-bssid_alloc.patch
1 Index: madwifi-trunk-r3776/ath/if_ath.c
2 ===================================================================
3 --- madwifi-trunk-r3776.orig/ath/if_ath.c 2008-07-17 01:49:58.000000000 +0200
4 +++ madwifi-trunk-r3776/ath/if_ath.c 2008-07-17 01:57:39.000000000 +0200
5 @@ -1347,11 +1347,12 @@
6 TAILQ_FOREACH(v, &ic->ic_vaps, iv_next)
7 id_mask |= (1 << ATH_GET_VAP_ID(v->iv_myaddr));
8
9 - for (id = 1; id < ath_maxvaps; id++) {
10 + for (id = 0; id < ath_maxvaps; id++) {
11 /* Get the first available slot. */
12 if ((id_mask & (1 << id)) == 0) {
13 ATH_SET_VAP_BSSID(vap->iv_myaddr, id);
14 ATH_SET_VAP_BSSID(vap->iv_bssid, id);
15 + sc->sc_bclast = id;
16 break;
17 }
18 }
19 @@ -1359,7 +1360,12 @@
20 EPRINTF(sc, "Unique BSSID requested on HW that does"
21 "does not support the necessary features.");
22 }
23 + } else {
24 + /* share the BSSID of the last created VAP */
25 + ATH_SET_VAP_BSSID(vap->iv_myaddr, sc->sc_bclast);
26 + ATH_SET_VAP_BSSID(vap->iv_bssid, sc->sc_bclast);
27 }
28 +
29 avp->av_bslot = -1;
30 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
31 atomic_set(&avp->av_beacon_alloc, 0);
32 Index: madwifi-trunk-r3776/ath/if_athvar.h
33 ===================================================================
34 --- madwifi-trunk-r3776.orig/ath/if_athvar.h 2008-07-17 01:27:21.000000000 +0200
35 +++ madwifi-trunk-r3776/ath/if_athvar.h 2008-07-17 01:57:15.000000000 +0200
36 @@ -802,7 +802,7 @@
37 } sc_updateslot; /* slot time update fsm */
38 int sc_slotupdate; /* slot to next advance fsm */
39 struct ieee80211vap **sc_bslot; /* beacon xmit slots */
40 - int sc_bnext; /* next slot for beacon xmit */
41 + int sc_bclast; /* last used slot for beacon xmit */
42
43 int sc_beacon_cal; /* use beacon timer for calibration */
44 long unsigned int sc_calinterval_sec; /* current interval for calibration (in seconds) */