From owner-svn-src-head@FreeBSD.ORG  Wed Jan  5 15:28:31 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 36C8B1065670;
	Wed,  5 Jan 2011 15:28:31 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 240DD8FC1C;
	Wed,  5 Jan 2011 15:28:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p05FSV2u082699;
	Wed, 5 Jan 2011 15:28:31 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p05FSVPL082696;
	Wed, 5 Jan 2011 15:28:31 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201101051528.p05FSVPL082696@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 5 Jan 2011 15:28:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217013 - in head: sbin/ifconfig sys/net
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Jan 2011 15:28:31 -0000

Author: marius
Date: Wed Jan  5 15:28:30 2011
New Revision: 217013
URL: http://svn.freebsd.org/changeset/base/217013

Log:
  Teach ifconfig(8) the handy shared option shortcut aliases the NetBSD
  counterpart also takes, i.e. "fdx" for "full-duplex", "flow" for
  "flowcontrol", "hdx" for "half-duplex" as well as "loop" and "loopback"
  for "hw-loopback".
  
  MFC after:	1 week

Modified:
  head/sbin/ifconfig/ifmedia.c
  head/sys/net/if_media.h

Modified: head/sbin/ifconfig/ifmedia.c
==============================================================================
--- head/sbin/ifconfig/ifmedia.c	Wed Jan  5 15:10:58 2011	(r217012)
+++ head/sbin/ifconfig/ifmedia.c	Wed Jan  5 15:28:30 2011	(r217013)
@@ -421,6 +421,9 @@ static struct ifmedia_description ifm_su
 static struct ifmedia_description ifm_shared_option_descriptions[] =
     IFM_SHARED_OPTION_DESCRIPTIONS;
 
+static struct ifmedia_description ifm_shared_option_aliases[] =
+    IFM_SHARED_OPTION_ALIASES;
+
 struct ifmedia_type_to_subtype {
 	struct {
 		struct ifmedia_description *desc;
@@ -429,7 +432,7 @@ struct ifmedia_type_to_subtype {
 	struct {
 		struct ifmedia_description *desc;
 		int alias;
-	} options[3];
+	} options[4];
 	struct {
 		struct ifmedia_description *desc;
 		int alias;
@@ -448,6 +451,7 @@ static struct ifmedia_type_to_subtype if
 		},
 		{
 			{ &ifm_shared_option_descriptions[0], 0 },
+			{ &ifm_shared_option_aliases[0], 1 },
 			{ &ifm_subtype_ethernet_option_descriptions[0], 0 },
 			{ NULL, 0 },
 		},
@@ -465,6 +469,7 @@ static struct ifmedia_type_to_subtype if
 		},
 		{
 			{ &ifm_shared_option_descriptions[0], 0 },
+			{ &ifm_shared_option_aliases[0], 1 },
 			{ &ifm_subtype_tokenring_option_descriptions[0], 0 },
 			{ NULL, 0 },
 		},
@@ -482,6 +487,7 @@ static struct ifmedia_type_to_subtype if
 		},
 		{
 			{ &ifm_shared_option_descriptions[0], 0 },
+			{ &ifm_shared_option_aliases[0], 1 },
 			{ &ifm_subtype_fddi_option_descriptions[0], 0 },
 			{ NULL, 0 },
 		},
@@ -499,6 +505,7 @@ static struct ifmedia_type_to_subtype if
 		},
 		{
 			{ &ifm_shared_option_descriptions[0], 0 },
+			{ &ifm_shared_option_aliases[0], 1 },
 			{ &ifm_subtype_ieee80211_option_descriptions[0], 0 },
 			{ NULL, 0 },
 		},
@@ -518,6 +525,7 @@ static struct ifmedia_type_to_subtype if
 		},
 		{
 			{ &ifm_shared_option_descriptions[0], 0 },
+			{ &ifm_shared_option_aliases[0], 1 },
 			{ &ifm_subtype_atm_option_descriptions[0], 0 },
 			{ NULL, 0 },
 		},

Modified: head/sys/net/if_media.h
==============================================================================
--- head/sys/net/if_media.h	Wed Jan  5 15:10:58 2011	(r217012)
+++ head/sys/net/if_media.h	Wed Jan  5 15:28:30 2011	(r217013)
@@ -598,6 +598,15 @@ struct ifmedia_description {
 	{ 0, NULL },							\
 }
 
+#define	IFM_SHARED_OPTION_ALIASES {					\
+	{ IFM_FDX,	"fdx" },					\
+	{ IFM_HDX,	"hdx" },					\
+	{ IFM_FLOW,	"flow" },					\
+	{ IFM_LOOP,	"loop" },					\
+	{ IFM_LOOP,	"loopback" },					\
+	{ 0, NULL },							\
+}
+
 /*
  * Baudrate descriptions for the various media types.
  */