diff options
author | Felix Fietkau <nbd@openwrt.org> | 2007-06-04 11:25:53 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2007-06-04 11:25:53 +0000 |
commit | 91142205534e135a29ceb3992708bf2ca3219021 (patch) | |
tree | 16e69db35c7fdf48ea76876109b0b38845361209 /package/madwifi/patches/121-ibss_hostap.patch | |
parent | d5b15895ef66b9a664afa72d88507060e1f0a270 (diff) | |
download | master-31e0f0ae-91142205534e135a29ceb3992708bf2ca3219021.tar.gz master-31e0f0ae-91142205534e135a29ceb3992708bf2ca3219021.tar.bz2 master-31e0f0ae-91142205534e135a29ceb3992708bf2ca3219021.zip |
refresh all package patches in the buildroot using quilt
SVN-Revision: 7490
Diffstat (limited to 'package/madwifi/patches/121-ibss_hostap.patch')
-rw-r--r-- | package/madwifi/patches/121-ibss_hostap.patch | 59 |
1 files changed, 32 insertions, 27 deletions
diff --git a/package/madwifi/patches/121-ibss_hostap.patch b/package/madwifi/patches/121-ibss_hostap.patch index a5a3ca99bc..24cbe98117 100644 --- a/package/madwifi/patches/121-ibss_hostap.patch +++ b/package/madwifi/patches/121-ibss_hostap.patch @@ -1,6 +1,7 @@ -diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c ---- madwifi.old/ath/if_ath.c 2007-06-01 12:22:06.641518272 +0200 -+++ madwifi.dev/ath/if_ath.c 2007-06-01 12:22:55.326117088 +0200 +Index: madwifi-ng-r2420-20070602/ath/if_ath.c +=================================================================== +--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:56.911324832 +0200 ++++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:57.500235304 +0200 @@ -407,7 +407,6 @@ * and use the next two bits as the index of the VAP. */ @@ -9,7 +10,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c #define ATH_SET_VAP_BSSID(bssid, id) \ do { \ if (id) \ -@@ -1048,9 +1048,12 @@ +@@ -1048,9 +1047,12 @@ ic_opmode = opmode; break; case IEEE80211_M_IBSS: @@ -25,7 +26,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c break; case IEEE80211_M_AHDEMO: case IEEE80211_M_MONITOR: -@@ -1080,7 +1083,7 @@ +@@ -1080,7 +1082,7 @@ return NULL; } @@ -34,7 +35,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c printk(KERN_WARNING "too many virtual ap's (already got %d)\n", sc->sc_nvaps); return NULL; } -@@ -1115,8 +1118,9 @@ +@@ -1115,8 +1117,9 @@ */ if (opmode == IEEE80211_M_MONITOR) dev->type = ARPHRD_IEEE80211_RADIOTAP; @@ -46,7 +47,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c struct ieee80211vap *v; unsigned int id_mask, id; -@@ -1129,18 +1133,22 @@ +@@ -1129,18 +1132,22 @@ /* do a full search to mark all the allocated VAPs */ id_mask = 0; @@ -73,7 +74,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c STAILQ_INIT(&avp->av_mcastq.axq_q); ATH_TXQ_LOCK_INIT(&avp->av_mcastq); if (opmode == IEEE80211_M_HOSTAP || opmode == IEEE80211_M_IBSS) { -@@ -1150,33 +1158,14 @@ +@@ -1150,33 +1157,14 @@ */ avp->av_bcbuf = STAILQ_FIRST(&sc->sc_bbuf); STAILQ_REMOVE_HEAD(&sc->sc_bbuf, bf_list); @@ -109,7 +110,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c /* * Multiple VAPs are to transmit beacons and we * have h/w support for TSF adjusting; enable use -@@ -1286,7 +1275,9 @@ +@@ -1286,7 +1274,9 @@ sc->sc_stagbeacons = 0; } @@ -120,16 +121,16 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c sc->sc_nstavaps--; sc->sc_nostabeacons = 0; } else if (vap->iv_opmode == IEEE80211_M_MONITOR) -@@ -3368,7 +3367,7 @@ - ((ic->ic_opmode == IEEE80211_M_HOSTAP) && - (ic->ic_protmode != IEEE80211_PROT_NONE))) +@@ -3362,7 +3352,7 @@ + sc->sc_opmode == HAL_M_IBSS || /* NB: AHDEMO too */ + (sc->sc_nostabeacons) || sc->sc_scanning) rfilt |= HAL_RX_FILTER_BEACON; - if (sc->sc_nmonvaps > 0) + if ((sc->sc_nmonvaps > 0) || ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0))) rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON | HAL_RX_FILTER_PROBEREQ | HAL_RX_FILTER_PROM); return rfilt; -@@ -5809,12 +5801,20 @@ +@@ -5809,12 +5799,20 @@ type = ieee80211_input(ni, skb, rs->rs_rssi, rs->rs_tstamp); ieee80211_unref_node(&ni); } else { @@ -152,9 +153,10 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c 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-06-01 12:22:06.642518120 +0200 -+++ madwifi.dev/ath/if_athvar.h 2007-06-01 12:21:54.640342728 +0200 +Index: madwifi-ng-r2420-20070602/ath/if_athvar.h +=================================================================== +--- madwifi-ng-r2420-20070602.orig/ath/if_athvar.h 2007-06-04 13:21:56.911324832 +0200 ++++ madwifi-ng-r2420-20070602/ath/if_athvar.h 2007-06-04 13:21:57.500235304 +0200 @@ -199,7 +199,7 @@ #define ATH_RXBUF 40 /* number of RX buffers */ #define ATH_TXBUF 200 /* number of TX buffers */ @@ -172,9 +174,10 @@ diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h 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-06-01 12:22:06.642518120 +0200 -+++ madwifi.dev/net80211/ieee80211_beacon.c 2007-06-01 12:21:54.640342728 +0200 +Index: madwifi-ng-r2420-20070602/net80211/ieee80211_beacon.c +=================================================================== +--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_beacon.c 2007-06-04 13:21:53.286875832 +0200 ++++ madwifi-ng-r2420-20070602/net80211/ieee80211_beacon.c 2007-06-04 13:21:57.501235152 +0200 @@ -111,7 +111,7 @@ bo->bo_tim = frm; @@ -184,10 +187,11 @@ diff -ur madwifi.old/net80211/ieee80211_beacon.c madwifi.dev/net80211/ieee80211_ *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-06-01 12:22:06.645517664 +0200 -+++ madwifi.dev/net80211/ieee80211_input.c 2007-06-01 12:21:54.642342424 +0200 -@@ -2953,7 +2953,13 @@ +Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c +=================================================================== +--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_input.c 2007-06-04 13:21:53.292874920 +0200 ++++ madwifi-ng-r2420-20070602/net80211/ieee80211_input.c 2007-06-04 13:21:57.502235000 +0200 +@@ -2939,7 +2939,13 @@ return; } if (ni == vap->iv_bss) { @@ -202,7 +206,7 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i /* * XXX Cannot tell if the sender is operating * in ibss mode. But we need a new node to -@@ -2962,12 +2968,13 @@ +@@ -2948,12 +2954,13 @@ */ ni = ieee80211_fakeup_adhoc_node(vap, wh->i_addr2); @@ -217,9 +221,10 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i } 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-06-01 12:22:06.646517512 +0200 -+++ madwifi.dev/net80211/ieee80211_node.c 2007-06-01 12:21:54.644342120 +0200 +Index: madwifi-ng-r2420-20070602/net80211/ieee80211_node.c +=================================================================== +--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_node.c 2007-06-04 13:21:55.391555872 +0200 ++++ madwifi-ng-r2420-20070602/net80211/ieee80211_node.c 2007-06-04 13:21:57.503234848 +0200 @@ -1082,8 +1082,25 @@ IEEE80211_NODE_TABLE_LOCK_ASSERT(nt); |