From owner-svn-src-head@FreeBSD.ORG Sun May 10 02:21:19 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ABC21106566C; Sun, 10 May 2009 02:21:19 +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 99AA28FC0C; Sun, 10 May 2009 02:21:19 +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 n4A2LJbH040526; Sun, 10 May 2009 02:21:19 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4A2LJkg040525; Sun, 10 May 2009 02:21:19 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200905100221.n4A2LJkg040525@svn.freebsd.org> From: Andrew Thompson Date: Sun, 10 May 2009 02:21:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191955 - head/sys/net80211 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 May 2009 02:21:20 -0000 Author: thompsa Date: Sun May 10 02:21:19 2009 New Revision: 191955 URL: http://svn.freebsd.org/changeset/base/191955 Log: Cancel the scan when going to INIT state. Should do this for other states here too as once the protocol newstate handler runs the scan has always ended. Modified: head/sys/net80211/ieee80211_proto.c Modified: head/sys/net80211/ieee80211_proto.c ============================================================================== --- head/sys/net80211/ieee80211_proto.c Sun May 10 00:00:25 2009 (r191954) +++ head/sys/net80211/ieee80211_proto.c Sun May 10 02:21:19 2009 (r191955) @@ -1834,6 +1834,8 @@ ieee80211_new_state_locked(struct ieee80 } break; case IEEE80211_S_INIT: + /* cancel any scan in progress */ + ieee80211_cancel_scan(vap); if (ostate == IEEE80211_S_INIT ) { /* XXX don't believe this */ /* INIT -> INIT. nothing to do */