X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/410d80b0c87de11d3f70b012b8168b8b00a76f3a..6c96f637204fdde26be02babca19f89fb3cb13f1:/package/madwifi/patches/305-pureg_fix.patch?ds=inline diff --git a/package/madwifi/patches/305-pureg_fix.patch b/package/madwifi/patches/305-pureg_fix.patch index 05c54d052..231ab081a 100644 --- a/package/madwifi/patches/305-pureg_fix.patch +++ b/package/madwifi/patches/305-pureg_fix.patch @@ -1,8 +1,6 @@ -Index: madwifi-dfs-r3246/ath/if_ath.c -=================================================================== ---- madwifi-dfs-r3246.orig/ath/if_ath.c 2008-01-25 16:30:04.921659489 +0100 -+++ madwifi-dfs-r3246/ath/if_ath.c 2008-01-25 16:33:11.528293596 +0100 -@@ -4086,7 +4086,9 @@ +--- a/ath/if_ath.c ++++ b/ath/if_ath.c +@@ -4158,7 +4158,9 @@ ath_calcrxfilter(struct ath_softc *sc) rfilt |= HAL_RX_FILTER_PROM; if (ic->ic_opmode == IEEE80211_M_STA || sc->sc_opmode == HAL_M_IBSS || /* NB: AHDEMO too */ @@ -13,11 +11,9 @@ Index: madwifi-dfs-r3246/ath/if_ath.c rfilt |= HAL_RX_FILTER_BEACON; if (sc->sc_nmonvaps > 0) rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON | -Index: madwifi-dfs-r3246/net80211/ieee80211_input.c -=================================================================== ---- madwifi-dfs-r3246.orig/net80211/ieee80211_input.c 2008-01-25 16:32:53.171247487 +0100 -+++ madwifi-dfs-r3246/net80211/ieee80211_input.c 2008-01-25 16:35:46.341115878 +0100 -@@ -346,11 +346,12 @@ +--- a/net80211/ieee80211_input.c ++++ b/net80211/ieee80211_input.c +@@ -346,11 +346,12 @@ ieee80211_input(struct ieee80211vap * va bssid = wh->i_addr3; } /* @@ -33,7 +29,7 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_input.c /* * allow MGT frames to vap->iv_xrvap. * this will allow roaming between XR and normal vaps -@@ -366,18 +367,14 @@ +@@ -366,18 +367,14 @@ ieee80211_input(struct ieee80211vap * va vap->iv_stats.is_rx_wrongbss++; goto out; } @@ -53,7 +49,7 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_input.c break; case IEEE80211_M_WDS: if (skb->len < sizeof(struct ieee80211_frame_addr4)) { -@@ -3023,7 +3020,7 @@ +@@ -3066,7 +3063,7 @@ ieee80211_recv_mgmt(struct ieee80211vap u_int8_t *frm, *efrm; u_int8_t *ssid, *rates, *xrates, *suppchan, *wpa, *rsn, *wme, *ath; u_int8_t rate; @@ -62,7 +58,7 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_input.c u_int8_t qosinfo; if (ni_or_null == NULL) -@@ -3053,11 +3050,15 @@ +@@ -3096,11 +3093,15 @@ ieee80211_recv_mgmt(struct ieee80211vap * o station mode when associated (to collect state * updates such as 802.11g slot time), or * o adhoc mode (to discover neighbors) @@ -79,7 +75,7 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_input.c vap->iv_stats.is_rx_mgtdiscard++; return; } -@@ -3140,6 +3141,7 @@ +@@ -3184,6 +3185,7 @@ ieee80211_recv_mgmt(struct ieee80211vap break; } scan.erp = frm[2]; @@ -87,7 +83,7 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_input.c break; case IEEE80211_ELEMID_RSN: scan.rsn = frm; -@@ -3357,6 +3359,20 @@ +@@ -3421,6 +3423,20 @@ ieee80211_recv_mgmt(struct ieee80211vap ieee80211_bg_scan(vap); return; } @@ -108,11 +104,9 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_input.c /* * If scanning, just pass information to the scan module. */ -Index: madwifi-dfs-r3246/net80211/ieee80211_node.c -=================================================================== ---- madwifi-dfs-r3246.orig/net80211/ieee80211_node.c 2008-01-25 16:27:28.000000000 +0100 -+++ madwifi-dfs-r3246/net80211/ieee80211_node.c 2008-01-25 16:33:11.540294282 +0100 -@@ -383,10 +383,16 @@ +--- a/net80211/ieee80211_node.c ++++ b/net80211/ieee80211_node.c +@@ -383,10 +383,16 @@ ieee80211_create_ibss(struct ieee80211va /* Update country ie information */ ieee80211_build_countryie(ic); @@ -131,11 +125,9 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_node.c (void) ieee80211_sta_join1(PASS_NODE(ni)); } -Index: madwifi-dfs-r3246/net80211/ieee80211_proto.c -=================================================================== ---- madwifi-dfs-r3246.orig/net80211/ieee80211_proto.c 2008-01-25 16:27:28.000000000 +0100 -+++ madwifi-dfs-r3246/net80211/ieee80211_proto.c 2008-01-25 16:33:11.544294507 +0100 -@@ -595,6 +595,28 @@ +--- a/net80211/ieee80211_proto.c ++++ b/net80211/ieee80211_proto.c +@@ -595,6 +595,28 @@ static const struct ieee80211_rateset ba { 4, { 2, 4, 11, 22 } }, /* IEEE80211_MODE_TURBO_G (mixed b/g) */ }; @@ -164,14 +156,12 @@ Index: madwifi-dfs-r3246/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-dfs-r3246/net80211/ieee80211_var.h -=================================================================== ---- madwifi-dfs-r3246.orig/net80211/ieee80211_var.h 2008-01-25 16:27:28.000000000 +0100 -+++ madwifi-dfs-r3246/net80211/ieee80211_var.h 2008-01-25 16:33:11.548294736 +0100 -@@ -688,6 +688,7 @@ +--- a/net80211/ieee80211_var.h ++++ b/net80211/ieee80211_var.h +@@ -708,6 +708,7 @@ int ieee80211_media_setup(struct ieee802 void ieee80211_build_sc_ie(struct ieee80211com *); void ieee80211_dfs_action(struct ieee80211com *); - void ieee80211_expire_channel_non_occupancy_restrictions(struct ieee80211com *); + void ieee80211_expire_channel_excl_restrictions(struct ieee80211com *); +void ieee80211_setpuregbasicrates(struct ieee80211_rateset *rs); /*