From owner-p4-projects@FreeBSD.ORG  Wed Apr  4 20:59:25 2007
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 63F5D16A405; Wed,  4 Apr 2007 20:59:25 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0A6D216A404
	for <perforce@freebsd.org>; Wed,  4 Apr 2007 20:59:25 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id EDFC913C480
	for <perforce@freebsd.org>; Wed,  4 Apr 2007 20:59:24 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34KxO0b083367
	for <perforce@freebsd.org>; Wed, 4 Apr 2007 20:59:24 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34KxOBa083362
	for perforce@freebsd.org; Wed, 4 Apr 2007 20:59:24 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 4 Apr 2007 20:59:24 GMT
Message-Id: <200704042059.l34KxOBa083362@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 117391 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: Wed, 04 Apr 2007 20:59:25 -0000

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

Change 117391 by sam@sam_ebb on 2007/04/04 20:58:43

	rename getfmediastate to ifmedia_getstate and expose it so
	other modules can use it; this will be needed by the 802.11
	code to do channel promotion

Affected files ...

.. //depot/projects/wifi/sbin/ifconfig/ifconfig.h#14 edit
.. //depot/projects/wifi/sbin/ifconfig/ifmedia.c#13 edit

Differences ...

==== //depot/projects/wifi/sbin/ifconfig/ifconfig.h#14 (text+ko) ====

@@ -140,3 +140,9 @@
 
 typedef void clone_callback_func(int, struct ifreq *);
 void	clone_setcallback(clone_callback_func *);
+
+/*
+ * XXX expose this so modules that neeed to know of any pending
+ * operations on ifmedia can avoid cmd line ordering confusion.
+ */
+struct ifmediareq *ifmedia_getstate(int s);

==== //depot/projects/wifi/sbin/ifconfig/ifmedia.c#13 (text+ko) ====

@@ -184,8 +184,8 @@
 	free(media_list);
 }
 
-static struct ifmediareq *
-getifmediastate(int s)
+struct ifmediareq *
+ifmedia_getstate(int s)
 {
 	static struct ifmediareq *ifmr = NULL;
 	int *mwords;
@@ -249,7 +249,7 @@
 	struct ifmediareq *ifmr;
 	int subtype;
 
-	ifmr = getifmediastate(s);
+	ifmr = ifmedia_getstate(s);
 
 	/*
 	 * We are primarily concerned with the top-level type.
@@ -294,7 +294,7 @@
 	struct ifmediareq *ifmr;
 	int options;
 
-	ifmr = getifmediastate(s);
+	ifmr = ifmedia_getstate(s);
 
 	options = get_media_options(IFM_TYPE(ifmr->ifm_ulist[0]), val);
 
@@ -319,7 +319,7 @@
 	struct ifmediareq *ifmr;
 	int inst;
 
-	ifmr = getifmediastate(s);
+	ifmr = ifmedia_getstate(s);
 
 	inst = atoi(val);
 	if (inst < 0 || inst > IFM_INST_MAX)
@@ -338,7 +338,7 @@
 	struct ifmediareq *ifmr;
 	int mode;
 
-	ifmr = getifmediastate(s);
+	ifmr = ifmedia_getstate(s);
 
 	mode = get_media_mode(IFM_TYPE(ifmr->ifm_ulist[0]), val);