From owner-p4-projects@FreeBSD.ORG  Mon Jul 31 03:17:07 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 989F816A4DA; Mon, 31 Jul 2006 03:17:07 +0000 (UTC)
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 5738516A4DD
	for <perforce@freebsd.org>; Mon, 31 Jul 2006 03:17:07 +0000 (UTC)
	(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 0C7D343D45
	for <perforce@freebsd.org>; Mon, 31 Jul 2006 03:17:07 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6V3H63g052114
	for <perforce@freebsd.org>; Mon, 31 Jul 2006 03:17:06 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6V3H6ft052105
	for perforce@freebsd.org; Mon, 31 Jul 2006 03:17:06 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 31 Jul 2006 03:17:06 GMT
Message-Id: <200607310317.k6V3H6ft052105@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 102823 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, 31 Jul 2006 03:17:07 -0000

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

Change 102823 by sam@sam_ebb on 2006/07/31 03:16:08

	mismerge

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_node.h#39 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#39 (text+ko) ====

@@ -203,7 +203,6 @@
 void	ieee80211_probe_curchan(struct ieee80211com *, int);
 void	ieee80211_create_ibss(struct ieee80211com*, struct ieee80211_channel *);
 void	ieee80211_reset_bss(struct ieee80211com *);
-void	ieee80211_end_scan(struct ieee80211com *);
 int	ieee80211_ibss_merge(struct ieee80211_node *);
 struct ieee80211_scan_entry;
 int	ieee80211_sta_join(struct ieee80211com *,