mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-18 09:54:05 +02:00
madwifi: add patch for doing ad-hoc and master mode at the same (including beacon handling)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7409 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
parent
139f47629b
commit
0cee365af0
@ -35,6 +35,7 @@ scan_atheros() {
|
|||||||
case "${adhoc:+1}:${sta:+1}:${ap+1}" in
|
case "${adhoc:+1}:${sta:+1}:${ap+1}" in
|
||||||
# valid mode combinations
|
# valid mode combinations
|
||||||
1::) wds="";;
|
1::) wds="";;
|
||||||
|
1::1);;
|
||||||
:1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA
|
:1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA
|
||||||
:1:);;
|
:1:);;
|
||||||
::1);;
|
::1);;
|
||||||
|
|||||||
251
package/madwifi/patches/121-ibss_hostap.patch
Normal file
251
package/madwifi/patches/121-ibss_hostap.patch
Normal file
@ -0,0 +1,251 @@
|
|||||||
|
diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
|
||||||
|
--- madwifi.old/ath/if_ath.c 2007-05-31 02:41:28.760477696 +0200
|
||||||
|
+++ madwifi.dev/ath/if_ath.c 2007-05-31 05:33:48.314626544 +0200
|
||||||
|
@@ -1026,9 +1026,12 @@
|
||||||
|
ic_opmode = opmode;
|
||||||
|
break;
|
||||||
|
case IEEE80211_M_IBSS:
|
||||||
|
- if (sc->sc_nvaps != 0) /* only one */
|
||||||
|
- return NULL;
|
||||||
|
- ic_opmode = opmode;
|
||||||
|
+ if (sc->sc_nvaps == 0) /* only one */
|
||||||
|
+ ic_opmode = opmode;
|
||||||
|
+ else
|
||||||
|
+ ic_opmode = IEEE80211_M_HOSTAP;
|
||||||
|
+
|
||||||
|
+ sc->sc_nibssvaps++;
|
||||||
|
break;
|
||||||
|
case IEEE80211_M_AHDEMO:
|
||||||
|
case IEEE80211_M_MONITOR:
|
||||||
|
@@ -1058,7 +1061,7 @@
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (sc->sc_nvaps >= ATH_BCBUF) {
|
||||||
|
+ if (sc->sc_nvaps + sc->sc_nibssvaps >= ATH_BCBUF) {
|
||||||
|
printk(KERN_WARNING "too many virtual ap's (already got %d)\n", sc->sc_nvaps);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
@@ -1093,8 +1096,8 @@
|
||||||
|
*/
|
||||||
|
if (opmode == IEEE80211_M_MONITOR)
|
||||||
|
dev->type = ARPHRD_IEEE80211_RADIOTAP;
|
||||||
|
- if ((flags & IEEE80211_CLONE_BSSID) &&
|
||||||
|
- sc->sc_nvaps != 0 && opmode != IEEE80211_M_WDS && sc->sc_hasbmask) {
|
||||||
|
+ if ((flags & IEEE80211_CLONE_BSSID) && sc->sc_hasbmask &&
|
||||||
|
+ (opmode == IEEE80211_M_HOSTAP || opmode == IEEE80211_M_IBSS)) {
|
||||||
|
struct ieee80211vap *v;
|
||||||
|
unsigned int id_mask, id;
|
||||||
|
|
||||||
|
@@ -1107,18 +1110,22 @@
|
||||||
|
|
||||||
|
/* do a full search to mark all the allocated VAPs */
|
||||||
|
id_mask = 0;
|
||||||
|
- TAILQ_FOREACH(v, &ic->ic_vaps, iv_next)
|
||||||
|
- id_mask |= (1 << ATH_GET_VAP_ID(v->iv_myaddr));
|
||||||
|
-
|
||||||
|
- for (id = 0; id < ATH_BCBUF; id++) {
|
||||||
|
+ TAILQ_FOREACH(v, &ic->ic_vaps, iv_next) {
|
||||||
|
+ struct ath_vap *a = (struct ath_vap *) v->iv_dev->priv;
|
||||||
|
+ if (a->av_bslot >= 0)
|
||||||
|
+ id_mask |= (1 << a->av_bslot);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* IBSS mode has local always set, so don't hand out beacon slot 0 to an IBSS vap */
|
||||||
|
+ for (id = (opmode == IEEE80211_M_IBSS ? 1 : 0); id < ATH_BCBUF; id++) {
|
||||||
|
/* get the first available slot */
|
||||||
|
if ((id_mask & (1 << id)) == 0) {
|
||||||
|
ATH_SET_VAP_BSSID(vap->iv_myaddr, id);
|
||||||
|
+ avp->av_bslot = id;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
- avp->av_bslot = -1;
|
||||||
|
STAILQ_INIT(&avp->av_mcastq.axq_q);
|
||||||
|
ATH_TXQ_LOCK_INIT(&avp->av_mcastq);
|
||||||
|
if (opmode == IEEE80211_M_HOSTAP || opmode == IEEE80211_M_IBSS) {
|
||||||
|
@@ -1128,33 +1135,14 @@
|
||||||
|
*/
|
||||||
|
avp->av_bcbuf = STAILQ_FIRST(&sc->sc_bbuf);
|
||||||
|
STAILQ_REMOVE_HEAD(&sc->sc_bbuf, bf_list);
|
||||||
|
- if (opmode == IEEE80211_M_HOSTAP || !sc->sc_hasveol) {
|
||||||
|
+ if ((opmode == IEEE80211_M_IBSS) || (opmode == IEEE80211_M_HOSTAP) || !sc->sc_hasveol) {
|
||||||
|
unsigned int slot;
|
||||||
|
- /*
|
||||||
|
- * Assign the VAP to a beacon xmit slot. As
|
||||||
|
- * above, this cannot fail to find one.
|
||||||
|
- */
|
||||||
|
- avp->av_bslot = 0;
|
||||||
|
- for (slot = 0; slot < ATH_BCBUF; slot++)
|
||||||
|
- if (sc->sc_bslot[slot] == NULL) {
|
||||||
|
- /*
|
||||||
|
- * XXX hack, space out slots to better
|
||||||
|
- * deal with misses
|
||||||
|
- */
|
||||||
|
- if (slot + 1 < ATH_BCBUF &&
|
||||||
|
- sc->sc_bslot[slot+1] == NULL) {
|
||||||
|
- avp->av_bslot = slot + 1;
|
||||||
|
- break;
|
||||||
|
- }
|
||||||
|
- avp->av_bslot = slot;
|
||||||
|
- /* NB: keep looking for a double slot */
|
||||||
|
- }
|
||||||
|
KASSERT(sc->sc_bslot[avp->av_bslot] == NULL,
|
||||||
|
("beacon slot %u not empty?", avp->av_bslot));
|
||||||
|
sc->sc_bslot[avp->av_bslot] = vap;
|
||||||
|
sc->sc_nbcnvaps++;
|
||||||
|
}
|
||||||
|
- if ((opmode == IEEE80211_M_HOSTAP) && (sc->sc_hastsfadd)) {
|
||||||
|
+ if ((sc->sc_opmode == IEEE80211_M_HOSTAP) && (sc->sc_hastsfadd)) {
|
||||||
|
/*
|
||||||
|
* Multiple VAPs are to transmit beacons and we
|
||||||
|
* have h/w support for TSF adjusting; enable use
|
||||||
|
@@ -1263,7 +1251,9 @@
|
||||||
|
if (sc->sc_nbcnvaps == 0)
|
||||||
|
sc->sc_stagbeacons = 0;
|
||||||
|
}
|
||||||
|
- if (vap->iv_opmode == IEEE80211_M_STA) {
|
||||||
|
+ if (vap->iv_opmode == IEEE80211_M_IBSS) {
|
||||||
|
+ sc->sc_nibssvaps--;
|
||||||
|
+ } if (vap->iv_opmode == IEEE80211_M_STA) {
|
||||||
|
sc->sc_nstavaps--;
|
||||||
|
if (sc->sc_nostabeacons)
|
||||||
|
sc->sc_nostabeacons = 0;
|
||||||
|
@@ -3379,7 +3369,8 @@
|
||||||
|
HAL_RX_FILTER_MCAST;
|
||||||
|
if (ic->ic_opmode != IEEE80211_M_STA)
|
||||||
|
rfilt |= HAL_RX_FILTER_PROBEREQ;
|
||||||
|
- if (ic->ic_opmode != IEEE80211_M_HOSTAP && (dev->flags & IFF_PROMISC))
|
||||||
|
+ if ((ic->ic_opmode != IEEE80211_M_HOSTAP && (dev->flags & IFF_PROMISC)) ||
|
||||||
|
+ ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0)))
|
||||||
|
rfilt |= HAL_RX_FILTER_PROM;
|
||||||
|
if (ic->ic_opmode == IEEE80211_M_STA ||
|
||||||
|
sc->sc_opmode == HAL_M_IBSS || /* NB: AHDEMO too */
|
||||||
|
@@ -3387,7 +3378,7 @@
|
||||||
|
((ic->ic_opmode == IEEE80211_M_HOSTAP) &&
|
||||||
|
(ic->ic_protmode != IEEE80211_PROT_NONE)))
|
||||||
|
rfilt |= HAL_RX_FILTER_BEACON;
|
||||||
|
- if (sc->sc_nmonvaps > 0)
|
||||||
|
+ if (sc->sc_nmonvaps > 0)
|
||||||
|
rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
|
||||||
|
HAL_RX_FILTER_PROBEREQ | HAL_RX_FILTER_PROM);
|
||||||
|
return rfilt;
|
||||||
|
@@ -5830,12 +5821,20 @@
|
||||||
|
type = ieee80211_input(ni, skb, rs->rs_rssi, rs->rs_tstamp);
|
||||||
|
ieee80211_unref_node(&ni);
|
||||||
|
} else {
|
||||||
|
+ const struct ieee80211_frame_min *wh = (const struct ieee80211_frame_min *) skb->data;
|
||||||
|
/*
|
||||||
|
* No key index or no entry, do a lookup and
|
||||||
|
* add the node to the mapping table if possible.
|
||||||
|
*/
|
||||||
|
- ni = ieee80211_find_rxnode(ic,
|
||||||
|
- (const struct ieee80211_frame_min *) skb->data);
|
||||||
|
+
|
||||||
|
+ if ((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PROBE_REQ)
|
||||||
|
+ /* if this is a probe request, send it to all vaps
|
||||||
|
+ * when looking up nodes, hostap will be preferred over ibss,
|
||||||
|
+ * because ibss will catch all nodes */
|
||||||
|
+ ni = NULL;
|
||||||
|
+ else
|
||||||
|
+ ni = ieee80211_find_rxnode(ic, (const struct ieee80211_frame_min *) skb->data);
|
||||||
|
+
|
||||||
|
if (ni != NULL) {
|
||||||
|
struct ath_node *an = ATH_NODE(ni);
|
||||||
|
ieee80211_keyix_t keyix;
|
||||||
|
diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
|
||||||
|
--- madwifi.old/ath/if_athvar.h 2007-05-31 02:41:28.730482256 +0200
|
||||||
|
+++ madwifi.dev/ath/if_athvar.h 2007-05-31 04:36:20.707742456 +0200
|
||||||
|
@@ -203,7 +203,7 @@
|
||||||
|
#define ATH_RXBUF 40 /* number of RX buffers */
|
||||||
|
#define ATH_TXBUF 200 /* number of TX buffers */
|
||||||
|
|
||||||
|
-#define ATH_BCBUF 4 /* number of beacon buffers */
|
||||||
|
+#define ATH_BCBUF 8 /* number of beacon buffers */
|
||||||
|
|
||||||
|
/* free buffer threshold to restart net dev */
|
||||||
|
#define ATH_TXBUF_FREE_THRESHOLD (ATH_TXBUF / 20)
|
||||||
|
@@ -605,6 +605,7 @@
|
||||||
|
u_int16_t sc_nvaps; /* # of active virtual ap's */
|
||||||
|
u_int8_t sc_nstavaps; /* # of active station vaps */
|
||||||
|
u_int8_t sc_nmonvaps; /* # of monitor vaps */
|
||||||
|
+ u_int8_t sc_nibssvaps; /* # of active ibss vaps */
|
||||||
|
u_int8_t sc_nbcnvaps; /* # of vaps sending beacons */
|
||||||
|
u_int sc_fftxqmin; /* aggregation threshold */
|
||||||
|
HAL_INT sc_imask; /* interrupt mask copy */
|
||||||
|
diff -ur madwifi.old/net80211/ieee80211_beacon.c madwifi.dev/net80211/ieee80211_beacon.c
|
||||||
|
--- madwifi.old/net80211/ieee80211_beacon.c 2007-05-31 02:41:28.781474504 +0200
|
||||||
|
+++ madwifi.dev/net80211/ieee80211_beacon.c 2007-05-31 03:29:12.197169152 +0200
|
||||||
|
@@ -111,7 +111,7 @@
|
||||||
|
bo->bo_tim = frm;
|
||||||
|
|
||||||
|
/* IBSS/TIM */
|
||||||
|
- if (vap->iv_opmode == IEEE80211_M_IBSS) {
|
||||||
|
+ if (ic->ic_opmode == IEEE80211_M_IBSS) {
|
||||||
|
*frm++ = IEEE80211_ELEMID_IBSSPARMS;
|
||||||
|
*frm++ = 2;
|
||||||
|
*frm++ = 0; *frm++ = 0; /* TODO: ATIM window */
|
||||||
|
diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_input.c
|
||||||
|
--- madwifi.old/net80211/ieee80211_input.c 2007-05-31 02:41:28.784474048 +0200
|
||||||
|
+++ madwifi.dev/net80211/ieee80211_input.c 2007-05-31 05:36:08.577303376 +0200
|
||||||
|
@@ -3020,7 +3020,13 @@
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (ni == vap->iv_bss) {
|
||||||
|
- if (vap->iv_opmode == IEEE80211_M_IBSS) {
|
||||||
|
+ /* this probe request may have been sent to all vaps
|
||||||
|
+ * to give each a chance of creating a node for this.
|
||||||
|
+ * important for hostap+ibss mode */
|
||||||
|
+ ni = ieee80211_find_rxnode(ic, (const struct ieee80211_frame_min *) skb->data);
|
||||||
|
+ if (ni) {
|
||||||
|
+ allocbs = 0;
|
||||||
|
+ } else if (vap->iv_opmode == IEEE80211_M_IBSS) {
|
||||||
|
/*
|
||||||
|
* XXX Cannot tell if the sender is operating
|
||||||
|
* in ibss mode. But we need a new node to
|
||||||
|
@@ -3029,12 +3035,13 @@
|
||||||
|
*/
|
||||||
|
ni = ieee80211_fakeup_adhoc_node(vap,
|
||||||
|
wh->i_addr2);
|
||||||
|
+ allocbs = 1;
|
||||||
|
} else {
|
||||||
|
ni = ieee80211_dup_bss(vap, wh->i_addr2, 1);
|
||||||
|
+ allocbs = 1;
|
||||||
|
}
|
||||||
|
if (ni == NULL)
|
||||||
|
return;
|
||||||
|
- allocbs = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr2,
|
||||||
|
diff -ur madwifi.old/net80211/ieee80211_node.c madwifi.dev/net80211/ieee80211_node.c
|
||||||
|
--- madwifi.old/net80211/ieee80211_node.c 2007-05-31 02:41:28.752478912 +0200
|
||||||
|
+++ madwifi.dev/net80211/ieee80211_node.c 2007-05-31 05:15:24.717398824 +0200
|
||||||
|
@@ -1088,8 +1088,25 @@
|
||||||
|
IEEE80211_NODE_TABLE_LOCK_ASSERT(nt);
|
||||||
|
|
||||||
|
hash = IEEE80211_NODE_HASH(macaddr);
|
||||||
|
+
|
||||||
|
+ /* look for non-ibss nodes first */
|
||||||
|
+ LIST_FOREACH(ni, &nt->nt_hash[hash], ni_hash) {
|
||||||
|
+ if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr) && ni->ni_vap->iv_opmode != IEEE80211_M_IBSS) {
|
||||||
|
+ ieee80211_ref_node(ni); /* mark referenced */
|
||||||
|
+#ifdef IEEE80211_DEBUG_REFCNT
|
||||||
|
+ IEEE80211_DPRINTF(ni->ni_vap, IEEE80211_MSG_NODE,
|
||||||
|
+ "%s (%s:%u) %p<%s> refcnt %d\n", __func__,
|
||||||
|
+ func, line,
|
||||||
|
+ ni, ether_sprintf(ni->ni_macaddr),
|
||||||
|
+ ieee80211_node_refcnt(ni));
|
||||||
|
+#endif
|
||||||
|
+ return ni;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* now look for ibss nodes */
|
||||||
|
LIST_FOREACH(ni, &nt->nt_hash[hash], ni_hash) {
|
||||||
|
- if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr)) {
|
||||||
|
+ if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr) && ni->ni_vap->iv_opmode == IEEE80211_M_IBSS) {
|
||||||
|
ieee80211_ref_node(ni); /* mark referenced */
|
||||||
|
#ifdef IEEE80211_DEBUG_REFCNT
|
||||||
|
IEEE80211_DPRINTF(ni->ni_vap, IEEE80211_MSG_NODE,
|
||||||
Loading…
Reference in New Issue
Block a user