Date: Fri, 3 Jul 2009 21:45:56 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r195327 - projects/mesh11s/sys/net80211 Message-ID: <200907032145.n63Lju4c089293@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Fri Jul 3 21:45:56 2009 New Revision: 195327 URL: http://svn.freebsd.org/changeset/base/195327 Log: hwmp_newstate(): use !init -> init state instead and don't use callout_active(). Submited by: sam Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Fri Jul 3 21:43:49 2009 (r195326) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Fri Jul 3 21:45:56 2009 (r195327) @@ -310,11 +310,14 @@ ieee80211_hwmp_newstate(struct ieee80211 enum ieee80211_state nstate = vap->iv_state; struct ieee80211_hwmp_state *hs = vap->iv_hwmp; - /* Flush the table on INIT -> SCAN, e.g. interface down & up */ - if (nstate == IEEE80211_S_SCAN && ostate == IEEE80211_S_INIT) { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n", + __func__, ieee80211_state_name[ostate], + ieee80211_state_name[nstate], arg); + + /* Flush the table on !INIT -> INIT, e.g. interface down & up */ + if (nstate != IEEE80211_S_INIT && ostate == IEEE80211_S_INIT) { hwmp_rt_flush(vap); - if (callout_active(&hs->hs_roottimer)) - callout_drain(&hs->hs_roottimer); + callout_drain(&hs->hs_roottimer); } return 0; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907032145.n63Lju4c089293>