diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-11-02 13:04:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-11-02 13:04:36 +0000 |
| commit | dec207d4eb4927112242da74afd1179d137fb1ad (patch) | |
| tree | 78dcafe3c951ea7e417aca01bd04b6e59c83f025 /package/madwifi/patches/305-pureg_fix.patch | |
| parent | 891b476e67c64477aac32094a29f3345e742da45 (diff) | |
| download | master-31e0f0ae-dec207d4eb4927112242da74afd1179d137fb1ad.tar.gz master-31e0f0ae-dec207d4eb4927112242da74afd1179d137fb1ad.tar.bz2 master-31e0f0ae-dec207d4eb4927112242da74afd1179d137fb1ad.zip | |
madwifi: fix noderef and state machine issues in the currently unused ap-to-ap wds mode; refresh patches
SVN-Revision: 13096
Diffstat (limited to 'package/madwifi/patches/305-pureg_fix.patch')
| -rw-r--r-- | package/madwifi/patches/305-pureg_fix.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/package/madwifi/patches/305-pureg_fix.patch b/package/madwifi/patches/305-pureg_fix.patch index 8950547d83..231ab081a4 100644 --- a/package/madwifi/patches/305-pureg_fix.patch +++ b/package/madwifi/patches/305-pureg_fix.patch @@ -1,6 +1,6 @@ --- a/ath/if_ath.c +++ b/ath/if_ath.c -@@ -4158,7 +4158,9 @@ +@@ -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,7 +13,7 @@ rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON | --- a/net80211/ieee80211_input.c +++ b/net80211/ieee80211_input.c -@@ -346,11 +346,12 @@ +@@ -346,11 +346,12 @@ ieee80211_input(struct ieee80211vap * va bssid = wh->i_addr3; } /* @@ -29,7 +29,7 @@ /* * 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; } @@ -49,7 +49,7 @@ break; case IEEE80211_M_WDS: if (skb->len < sizeof(struct ieee80211_frame_addr4)) { -@@ -3066,7 +3063,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; @@ -58,7 +58,7 @@ u_int8_t qosinfo; if (ni_or_null == NULL) -@@ -3096,11 +3093,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) @@ -75,7 +75,7 @@ vap->iv_stats.is_rx_mgtdiscard++; return; } -@@ -3184,6 +3185,7 @@ +@@ -3184,6 +3185,7 @@ ieee80211_recv_mgmt(struct ieee80211vap break; } scan.erp = frm[2]; @@ -83,7 +83,7 @@ break; case IEEE80211_ELEMID_RSN: scan.rsn = frm; -@@ -3421,6 +3423,20 @@ +@@ -3421,6 +3423,20 @@ ieee80211_recv_mgmt(struct ieee80211vap ieee80211_bg_scan(vap); return; } @@ -106,7 +106,7 @@ */ --- a/net80211/ieee80211_node.c +++ b/net80211/ieee80211_node.c -@@ -383,10 +383,16 @@ +@@ -383,10 +383,16 @@ ieee80211_create_ibss(struct ieee80211va /* Update country ie information */ ieee80211_build_countryie(ic); @@ -127,7 +127,7 @@ } --- a/net80211/ieee80211_proto.c +++ b/net80211/ieee80211_proto.c -@@ -595,6 +595,28 @@ +@@ -595,6 +595,28 @@ static const struct ieee80211_rateset ba { 4, { 2, 4, 11, 22 } }, /* IEEE80211_MODE_TURBO_G (mixed b/g) */ }; @@ -158,7 +158,7 @@ * specified mode. For 11b compatibility we mark only 11b --- a/net80211/ieee80211_var.h +++ b/net80211/ieee80211_var.h -@@ -708,6 +708,7 @@ +@@ -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_excl_restrictions(struct ieee80211com *); |