From owner-p4-projects@FreeBSD.ORG  Tue May 20 22:31:43 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 609E91065672; Tue, 20 May 2008 22:31:43 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 22AC1106564A
	for <perforce@freebsd.org>; Tue, 20 May 2008 22:31:43 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 195968FC14
	for <perforce@freebsd.org>; Tue, 20 May 2008 22:31:43 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4KMVgKE087259
	for <perforce@freebsd.org>; Tue, 20 May 2008 22:31:42 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4KMVgCK087257
	for perforce@freebsd.org; Tue, 20 May 2008 22:31:42 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 20 May 2008 22:31:42 GMT
Message-Id: <200805202231.m4KMVgCK087257@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 141936 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 May 2008 22:31:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=141936

Change 141936 by sam@sam_ebb on 2008/05/20 22:31:10

	don't reset the swbmiss timer in the state machine; it's not
	used in adhoc or wds modes (yet)

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#12 edit
.. //depot/projects/vap/sys/net80211/ieee80211_wds.c#8 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#12 (text+ko) ====

@@ -115,8 +115,6 @@
 	if (ostate != IEEE80211_S_SCAN)
 		ieee80211_cancel_scan(vap);	/* background scan */
 	ni = vap->iv_bss;			/* NB: no reference held */
-	if (vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS)
-		callout_stop(&vap->iv_swbmiss);
 	switch (nstate) {
 	case IEEE80211_S_INIT:
 		switch (ostate) {

==== //depot/projects/vap/sys/net80211/ieee80211_wds.c#8 (text+ko) ====

@@ -403,8 +403,6 @@
 	if (ostate != IEEE80211_S_SCAN)
 		ieee80211_cancel_scan(vap);	/* background scan */
 	ni = vap->iv_bss;			/* NB: no reference held */
-	if (vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS)
-		callout_stop(&vap->iv_swbmiss);
 	error = 0;
 	switch (nstate) {
 	case IEEE80211_S_INIT: