From owner-svn-src-user@FreeBSD.ORG Wed Apr 15 14:51:41 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EAB57106566C; Wed, 15 Apr 2009 14:51:41 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D94A88FC19; Wed, 15 Apr 2009 14:51:41 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3FEpfXd045754; Wed, 15 Apr 2009 14:51:41 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3FEpf4G045751; Wed, 15 Apr 2009 14:51:41 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200904151451.n3FEpf4G045751@svn.freebsd.org> From: Andrew Thompson Date: Wed, 15 Apr 2009 14:51:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191102 - user/thompsa/vaptq/sys/net80211 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2009 14:51:42 -0000 Author: thompsa Date: Wed Apr 15 14:51:41 2009 New Revision: 191102 URL: http://svn.freebsd.org/changeset/base/191102 Log: Perform the channel change in ieee80211_setcurchan() on the taskqueue. This is safe as the channel is set before the new state is switched in ieee80211_sta_join(), the taskqueue is serialised so the channel change is guaranteed to have completed before the state transition happens. Modified: user/thompsa/vaptq/sys/net80211/ieee80211_node.c user/thompsa/vaptq/sys/net80211/ieee80211_proto.c user/thompsa/vaptq/sys/net80211/ieee80211_var.h Modified: user/thompsa/vaptq/sys/net80211/ieee80211_node.c ============================================================================== --- user/thompsa/vaptq/sys/net80211/ieee80211_node.c Wed Apr 15 05:37:17 2009 (r191101) +++ user/thompsa/vaptq/sys/net80211/ieee80211_node.c Wed Apr 15 14:51:41 2009 (r191102) @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -653,7 +654,11 @@ ieee80211_setcurchan(struct ieee80211com ic->ic_bsschan = ic->ic_curchan = c; ic->ic_curmode = ieee80211_chan2mode(ic->ic_curchan); ic->ic_rt = ieee80211_get_ratetable(ic->ic_curchan); - ic->ic_set_channel(ic); + /* + * The channel change is guaranteed to have happened before the next + * state change + */ + taskqueue_enqueue(ic->ic_tq, &ic->ic_chan_task); } /* Modified: user/thompsa/vaptq/sys/net80211/ieee80211_proto.c ============================================================================== --- user/thompsa/vaptq/sys/net80211/ieee80211_proto.c Wed Apr 15 05:37:17 2009 (r191101) +++ user/thompsa/vaptq/sys/net80211/ieee80211_proto.c Wed Apr 15 14:51:41 2009 (r191102) @@ -99,6 +99,7 @@ const char *ieee80211_wme_acnames[] = { static void parent_updown(void *, int); static void update_mcast(void *, int); static void update_promisc(void *, int); +static void update_channel(void *, int); static void ieee80211_newstate_cb(void *, int); static int ieee80211_newstate_cb_locked(struct ieee80211vap *, enum ieee80211_state, int); @@ -138,6 +139,7 @@ ieee80211_proto_attach(struct ieee80211c TASK_INIT(&ic->ic_parent_task, 0, parent_updown, ifp); TASK_INIT(&ic->ic_mcast_task, 0, update_mcast, ic); TASK_INIT(&ic->ic_promisc_task, 0, update_promisc, ic); + TASK_INIT(&ic->ic_chan_task, 0, update_channel, ic); ic->ic_wme.wme_hipri_switch_hysteresis = AGGRESSIVE_MODE_SWITCH_HYSTERESIS; @@ -1098,6 +1100,14 @@ update_promisc(void *arg, int npending) ic->ic_update_promisc(parent); } +static void +update_channel(void *arg, int npending) +{ + struct ieee80211com *ic = arg; + + ic->ic_set_channel(ic); +} + /* * Block until the parent is in a known state. This is * used after any operations that dispatch a task (e.g. @@ -1109,6 +1119,7 @@ ieee80211_waitfor_parent(struct ieee8021 taskqueue_drain(ic->ic_tq, &ic->ic_parent_task); taskqueue_drain(ic->ic_tq, &ic->ic_mcast_task); taskqueue_drain(ic->ic_tq, &ic->ic_promisc_task); + taskqueue_drain(ic->ic_tq, &ic->ic_chan_task); } /* Modified: user/thompsa/vaptq/sys/net80211/ieee80211_var.h ============================================================================== --- user/thompsa/vaptq/sys/net80211/ieee80211_var.h Wed Apr 15 05:37:17 2009 (r191101) +++ user/thompsa/vaptq/sys/net80211/ieee80211_var.h Wed Apr 15 14:51:41 2009 (r191102) @@ -128,6 +128,7 @@ struct ieee80211com { struct task ic_parent_task; /* deferred parent processing */ struct task ic_promisc_task;/* deferred promisc update */ struct task ic_mcast_task; /* deferred mcast update */ + struct task ic_chan_task; /* deferred channel change */ uint32_t ic_flags; /* state flags */ uint32_t ic_flags_ext; /* extended state flags */