diff options
author | Felix Fietkau <nbd@openwrt.org> | 2007-07-03 21:03:58 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2007-07-03 21:03:58 +0000 |
commit | 8117b40bf04ff6c7ccebf50324189a894aed607e (patch) | |
tree | 5a2cb27c62a6f7476ae08c8aceeae5f2f0565737 /package/madwifi/patches/305-pureg_fix.patch | |
parent | 3d0376e30aaa496538b17488fff737001330dc88 (diff) | |
download | mtk-20170518-8117b40bf04ff6c7ccebf50324189a894aed607e.zip mtk-20170518-8117b40bf04ff6c7ccebf50324189a894aed607e.tar.gz mtk-20170518-8117b40bf04ff6c7ccebf50324189a894aed607e.tar.bz2 |
update to the latest madwifi snapshot
SVN-Revision: 7864
Diffstat (limited to 'package/madwifi/patches/305-pureg_fix.patch')
-rw-r--r-- | package/madwifi/patches/305-pureg_fix.patch | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/package/madwifi/patches/305-pureg_fix.patch b/package/madwifi/patches/305-pureg_fix.patch index d3c49d1..c354283 100644 --- a/package/madwifi/patches/305-pureg_fix.patch +++ b/package/madwifi/patches/305-pureg_fix.patch @@ -1,8 +1,8 @@ -Index: madwifi-ng-r2420-20070602/ath/if_ath.c +Index: madwifi-ng-r2525-20070630/ath/if_ath.c =================================================================== ---- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-04 13:21:58.684055336 +0200 -+++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-06-04 13:21:58.895023264 +0200 -@@ -3362,7 +3362,9 @@ +--- madwifi-ng-r2525-20070630.orig/ath/if_ath.c 2007-07-03 23:02:33.302125000 +0200 ++++ madwifi-ng-r2525-20070630/ath/if_ath.c 2007-07-03 23:02:33.594143250 +0200 +@@ -3392,7 +3392,9 @@ rfilt |= HAL_RX_FILTER_PROM; if (ic->ic_opmode == IEEE80211_M_STA || sc->sc_opmode == HAL_M_IBSS || /* NB: AHDEMO too */ @@ -13,10 +13,10 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c rfilt |= HAL_RX_FILTER_BEACON; if ((sc->sc_nmonvaps > 0) || ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0))) rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON | -Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c +Index: madwifi-ng-r2525-20070630/net80211/ieee80211_input.c =================================================================== ---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_input.c 2007-06-04 13:21:58.461089232 +0200 -+++ madwifi-ng-r2420-20070602/net80211/ieee80211_input.c 2007-06-04 13:21:58.897022960 +0200 +--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_input.c 2007-07-03 23:02:33.002106250 +0200 ++++ madwifi-ng-r2525-20070630/net80211/ieee80211_input.c 2007-07-03 23:02:33.598143500 +0200 @@ -321,11 +321,12 @@ bssid = wh->i_addr3; } @@ -42,7 +42,7 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c /* not interested in */ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, bssid, NULL, "%s", "not to bss"); -@@ -2542,7 +2544,7 @@ +@@ -2541,7 +2543,7 @@ u_int8_t *frm, *efrm; u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath; u_int8_t rate; @@ -51,7 +51,7 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c u_int8_t qosinfo; wh = (struct ieee80211_frame *) skb->data; -@@ -2564,11 +2566,15 @@ +@@ -2563,11 +2565,15 @@ * o station mode when associated (to collect state * updates such as 802.11g slot time), or * o adhoc mode (to discover neighbors) @@ -68,7 +68,7 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c vap->iv_stats.is_rx_mgtdiscard++; return; } -@@ -2651,6 +2657,7 @@ +@@ -2650,6 +2656,7 @@ break; } scan.erp = frm[2]; @@ -76,7 +76,7 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c break; case IEEE80211_ELEMID_RSN: scan.rsn = frm; -@@ -2826,6 +2833,20 @@ +@@ -2867,6 +2874,20 @@ ieee80211_bg_scan(vap); return; } @@ -84,11 +84,11 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c + /* Update AP protection mode when in 11G mode */ + if ((vap->iv_opmode == IEEE80211_M_HOSTAP) && + IEEE80211_IS_CHAN_ANYG(ic->ic_curchan)) { -+ ++ + /* Assume no ERP IE == 11b AP */ + if ((!has_erp || (has_erp && (scan.erp & IEEE80211_ERP_NON_ERP_PRESENT))) && + !(ic->ic_flags & IEEE80211_F_USEPROT)) { -+ ++ + ic->ic_flags |= IEEE80211_F_USEPROT; + ic->ic_flags_ext |= IEEE80211_FEXT_ERPUPDATE; + } @@ -97,10 +97,10 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c /* * If scanning, just pass information to the scan module. */ -Index: madwifi-ng-r2420-20070602/net80211/ieee80211_node.c +Index: madwifi-ng-r2525-20070630/net80211/ieee80211_node.c =================================================================== ---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_node.c 2007-06-04 13:21:57.503234848 +0200 -+++ madwifi-ng-r2420-20070602/net80211/ieee80211_node.c 2007-06-04 13:21:58.897022960 +0200 +--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_node.c 2007-07-03 23:02:31.037983500 +0200 ++++ madwifi-ng-r2525-20070630/net80211/ieee80211_node.c 2007-07-03 23:02:33.598143500 +0200 @@ -332,10 +332,16 @@ /* Update country ie information */ ieee80211_build_countryie(ic); @@ -115,15 +115,15 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_node.c + + if ((vap->iv_flags & IEEE80211_F_PUREG) && + IEEE80211_IS_CHAN_ANYG(chan)) { -+ ieee80211_setpuregbasicrates(&ni->ni_rates); ++ ieee80211_setpuregbasicrates(&ni->ni_rates); + } (void) ieee80211_sta_join1(PASS_NODE(ni)); } -Index: madwifi-ng-r2420-20070602/net80211/ieee80211_proto.c +Index: madwifi-ng-r2525-20070630/net80211/ieee80211_proto.c =================================================================== ---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_proto.c 2007-06-04 13:21:58.133139088 +0200 -+++ madwifi-ng-r2420-20070602/net80211/ieee80211_proto.c 2007-06-04 13:21:58.898022808 +0200 +--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_proto.c 2007-07-03 23:02:32.306062750 +0200 ++++ madwifi-ng-r2525-20070630/net80211/ieee80211_proto.c 2007-07-03 23:02:33.630145500 +0200 @@ -586,6 +586,28 @@ { 4, { 2, 4, 11, 22 } }, /* IEEE80211_MODE_TURBO_G (mixed b/g) */ }; @@ -153,16 +153,16 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_proto.c /* * Mark the basic rates for the 11g rate table based on the * specified mode. For 11b compatibility we mark only 11b -Index: madwifi-ng-r2420-20070602/net80211/ieee80211_var.h +Index: madwifi-ng-r2525-20070630/net80211/ieee80211_var.h =================================================================== ---- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_var.h 2007-06-04 13:21:58.134138936 +0200 -+++ madwifi-ng-r2420-20070602/net80211/ieee80211_var.h 2007-06-04 13:21:58.899022656 +0200 -@@ -593,6 +593,8 @@ +--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_var.h 2007-07-03 23:02:32.330064250 +0200 ++++ madwifi-ng-r2525-20070630/net80211/ieee80211_var.h 2007-07-03 23:02:33.678148500 +0200 +@@ -592,6 +592,8 @@ void ieee80211_build_countryie(struct ieee80211com *); int ieee80211_media_setup(struct ieee80211com *, struct ifmedia *, u_int32_t, ifm_change_cb_t, ifm_stat_cb_t); +void ieee80211_setpuregbasicrates(struct ieee80211_rateset *rs); -+ ++ /* Key update synchronization methods. XXX should not be visible. */ static __inline void |