X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6b3c1f56d16aa225b7ee2d96f24e74f1b9369954..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 d33bc589b..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-r2996/ath/if_ath.c -=================================================================== ---- madwifi-dfs-r2996.orig/ath/if_ath.c 2007-12-01 18:54:22.276777879 +0100 -+++ madwifi-dfs-r2996/ath/if_ath.c 2007-12-01 18:54:45.982128761 +0100 -@@ -3998,7 +3998,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 */ @@ -11,38 +9,47 @@ Index: madwifi-dfs-r2996/ath/if_ath.c + ((ic->ic_opmode == IEEE80211_M_HOSTAP) && + (ic->ic_protmode != IEEE80211_PROT_NONE))) rfilt |= HAL_RX_FILTER_BEACON; - if ((sc->sc_nmonvaps > 0) || ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0))) + if (sc->sc_nmonvaps > 0) rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON | -Index: madwifi-dfs-r2996/net80211/ieee80211_input.c -=================================================================== ---- madwifi-dfs-r2996.orig/net80211/ieee80211_input.c 2007-12-01 18:53:44.638633004 +0100 -+++ madwifi-dfs-r2996/net80211/ieee80211_input.c 2007-12-01 18:54:45.986128992 +0100 -@@ -329,11 +329,12 @@ +--- a/net80211/ieee80211_input.c ++++ b/net80211/ieee80211_input.c +@@ -346,11 +346,12 @@ ieee80211_input(struct ieee80211vap * va bssid = wh->i_addr3; } /* - * Validate the bssid. + * Validate the bssid. Let beacons get through though for 11g protection mode. */ - #ifdef ATH_SUPERG_XR - if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && +-#ifdef ATH_SUPERG_XR + if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bssid) && - !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) { + !IEEE80211_ADDR_EQ(bssid, dev->broadcast) && + (subtype != IEEE80211_FC0_SUBTYPE_BEACON)) { ++#ifdef ATH_SUPERG_XR /* * allow MGT frames to vap->iv_xrvap. * this will allow roaming between XR and normal vaps -@@ -352,7 +353,8 @@ - } +@@ -366,18 +367,14 @@ ieee80211_input(struct ieee80211vap * va + vap->iv_stats.is_rx_wrongbss++; + goto out; + } +- } #else - if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && +- if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bssid) && - !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) { -+ !IEEE80211_ADDR_EQ(bssid, dev->broadcast) && -+ (subtype != IEEE80211_FC0_SUBTYPE_BEACON)) { /* not interested in */ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, bssid, NULL, "%s", "not to bss"); -@@ -2971,7 +2973,7 @@ + vap->iv_stats.is_rx_wrongbss++; + goto out; +- } +- + #endif ++ } + break; + case IEEE80211_M_WDS: + if (skb->len < sizeof(struct ieee80211_frame_addr4)) { +@@ -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; @@ -51,7 +58,7 @@ Index: madwifi-dfs-r2996/net80211/ieee80211_input.c u_int8_t qosinfo; if (ni_or_null == NULL) -@@ -2996,11 +2998,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) @@ -68,7 +75,7 @@ Index: madwifi-dfs-r2996/net80211/ieee80211_input.c vap->iv_stats.is_rx_mgtdiscard++; return; } -@@ -3083,6 +3089,7 @@ +@@ -3184,6 +3185,7 @@ ieee80211_recv_mgmt(struct ieee80211vap break; } scan.erp = frm[2]; @@ -76,7 +83,7 @@ Index: madwifi-dfs-r2996/net80211/ieee80211_input.c break; case IEEE80211_ELEMID_RSN: scan.rsn = frm; -@@ -3300,6 +3307,20 @@ +@@ -3421,6 +3423,20 @@ ieee80211_recv_mgmt(struct ieee80211vap ieee80211_bg_scan(vap); return; } @@ -97,11 +104,9 @@ Index: madwifi-dfs-r2996/net80211/ieee80211_input.c /* * If scanning, just pass information to the scan module. */ -Index: madwifi-dfs-r2996/net80211/ieee80211_node.c -=================================================================== ---- madwifi-dfs-r2996.orig/net80211/ieee80211_node.c 2007-12-01 18:47:16.968540943 +0100 -+++ madwifi-dfs-r2996/net80211/ieee80211_node.c 2007-12-01 18:54:45.998129686 +0100 -@@ -380,10 +380,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); @@ -120,11 +125,9 @@ Index: madwifi-dfs-r2996/net80211/ieee80211_node.c (void) ieee80211_sta_join1(PASS_NODE(ni)); } -Index: madwifi-dfs-r2996/net80211/ieee80211_proto.c -=================================================================== ---- madwifi-dfs-r2996.orig/net80211/ieee80211_proto.c 2007-12-01 18:45:14.000000000 +0100 -+++ madwifi-dfs-r2996/net80211/ieee80211_proto.c 2007-12-01 18:54:46.002129908 +0100 -@@ -586,6 +586,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) */ }; @@ -153,14 +156,12 @@ Index: madwifi-dfs-r2996/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-r2996/net80211/ieee80211_var.h -=================================================================== ---- madwifi-dfs-r2996.orig/net80211/ieee80211_var.h 2007-12-01 18:45:14.000000000 +0100 -+++ madwifi-dfs-r2996/net80211/ieee80211_var.h 2007-12-01 18:55:00.502956262 +0100 -@@ -668,6 +668,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); /*