From owner-p4-projects@FreeBSD.ORG  Thu Jan  1 20:41:42 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7BC6116A4D0; Thu,  1 Jan 2004 20:41:42 -0800 (PST)
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 5658016A4CE
	for <perforce@freebsd.org>; Thu,  1 Jan 2004 20:41:42 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8260943D1D
	for <perforce@freebsd.org>; Thu,  1 Jan 2004 20:41:41 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i024ff0B053062
	for <perforce@freebsd.org>; Thu, 1 Jan 2004 20:41:41 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i024ffnO053056
	for perforce@freebsd.org; Thu, 1 Jan 2004 20:41:41 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Thu, 1 Jan 2004 20:41:41 -0800 (PST)
Message-Id: <200401020441.i024ffnO053056@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>
Subject: PERFORCE change 44664 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Fri, 02 Jan 2004 04:41:42 -0000

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

Change 44664 by sam@sam_ebb on 2004/01/01 20:41:20

	shim ifmedia_removeall for NetBSD

Affected files ...

.. //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#3 edit
.. //depot/projects/netperf+sockets/sys/net80211/ieee80211_compat.h#2 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/net80211/ieee80211.c#3 (text+ko) ====

@@ -162,11 +162,7 @@
 	ieee80211_proto_detach(ifp);
 	ieee80211_crypto_detach(ifp);
 	ieee80211_node_detach(ifp);
-#ifdef __FreeBSD__
 	ifmedia_removeall(&ic->ic_media);
-#else
-        ifmedia_delete_instance(&ic->ic_media, IFM_INST_ANY);
-#endif
 #if NBPFILTER > 0
 	bpfdetach(ifp);
 #endif

==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_compat.h#2 (text+ko) ====

@@ -58,6 +58,9 @@
 	splx(s);
 	return refcnt;
 }
+
+#define	ifmedia_removeall(_media) \
+        ifmedia_delete_instance((_media), IFM_INST_ANY)
 #endif /* __NetBSD__ */
 
 #ifdef __FreeBSD__