From owner-p4-projects@FreeBSD.ORG  Mon Jan 30 21:24:22 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D4B7616A459; Mon, 30 Jan 2006 21:24:20 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9A8F216A453
	for <perforce@freebsd.org>; Mon, 30 Jan 2006 21:24:20 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 01EF243D46
	for <perforce@freebsd.org>; Mon, 30 Jan 2006 21:24:20 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0ULOJp8052396
	for <perforce@freebsd.org>; Mon, 30 Jan 2006 21:24:19 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0ULOJte052388
	for perforce@freebsd.org; Mon, 30 Jan 2006 21:24:19 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 30 Jan 2006 21:24:19 GMT
Message-Id: <200601302124.k0ULOJte052388@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 90716 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: Mon, 30 Jan 2006 21:24:22 -0000

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

Change 90716 by sam@sam_ebb on 2006/01/30 21:23:39

	fix mismerge

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#43 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#43 (text+ko) ====

@@ -1063,8 +1063,6 @@
 	callout_stop(&ic->ic_mgtsend);		/* XXX callout_drain */
 	if (ostate != IEEE80211_S_SCAN)
 		ieee80211_cancel_scan(ic);	/* background scan */
-	if (ic->ic_flags_ext & IEEE80211_FEXT_SWBMISS)
-		callout_stop(&ic->ic_swbmiss);
 	ni = ic->ic_bss;			/* NB: no reference held */
 	if (ic->ic_flags_ext & IEEE80211_FEXT_SWBMISS)
 		callout_stop(&ic->ic_swbmiss);