Date: Thu, 2 Dec 2004 03:01:03 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 66235 for review Message-ID: <200412020301.iB2313Pw039171@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=66235 Change 66235 by sam@sam_ebb on 2004/12/02 03:00:35 Be more careful about reseting state when transitioning to S_INIT; in particular clear ic_bss so any previous setup is wiped. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#21 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#14 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#10 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#21 (text+ko) ==== @@ -162,8 +162,7 @@ rsn->rsn_keymgmtset = WPA_ASE_8021X_UNSPEC | WPA_ASE_8021X_PSK; rsn->rsn_keymgmt = WPA_ASE_8021X_PSK; - ic->ic_bss = ni; - ieee80211_ref_node(ic->ic_bss); /* hold reference */ + ic->ic_bss = ieee80211_ref_node(ni); /* hold reference */ ic->ic_auth = ieee80211_authenticator_get(ni->ni_authmode); } @@ -432,6 +431,24 @@ ieee80211_new_state(ic, IEEE80211_S_RUN, -1); } +void +ieee80211_reset_bss(struct ieee80211com *ic) +{ + struct ieee80211_node *ni, *obss; + + ieee80211_node_table_reset(&ic->ic_scan); + ni = ieee80211_alloc_node(&ic->ic_scan, ic->ic_myaddr); + KASSERT(ni != NULL, ("unable to setup inital BSS node")); + obss = ic->ic_bss; + ic->ic_bss = ieee80211_ref_node(ni); + if (obss != NULL) + ieee80211_free_node(obss); + if (ic->ic_sta != NULL) { + ieee80211_node_table_free(ic->ic_sta); + ic->ic_sta = NULL; + } +} + static int ieee80211_match_bss(struct ieee80211com *ic, struct ieee80211_node *ni) { ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#14 (text+ko) ==== @@ -186,6 +186,7 @@ extern int ieee80211_next_scan(struct ieee80211com *); extern void ieee80211_create_ibss(struct ieee80211com*, struct ieee80211_channel *); +extern void ieee80211_reset_bss(struct ieee80211com *); extern void ieee80211_end_scan(struct ieee80211com *); extern int ieee80211_ibss_merge(struct ieee80211com *, struct ieee80211_node *); ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#10 (text+ko) ==== @@ -883,12 +883,8 @@ case IEEE80211_S_SCAN: reset: ic->ic_mgt_timer = 0; - ieee80211_node_table_reset(&ic->ic_scan); IF_DRAIN(&ic->ic_mgtq); - if (ic->ic_sta != NULL) { - ieee80211_node_table_free(ic->ic_sta); - ic->ic_sta = NULL; - } + ieee80211_reset_bss(ic); break; } if (ic->ic_auth->ia_detach != NULL)help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412020301.iB2313Pw039171>