svn commit: r217423 - in stable/7: sbin/ifconfig sys/net

[Marius Strobl]

Author: marius
Date: Fri Jan 14 20:43:24 2011
New Revision: 217423
URL: http://svn.freebsd.org/changeset/base/217423

Log:
  MFC: r217013
  
  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".

Modified:
  stable/7/sbin/ifconfig/ifmedia.c
  stable/7/sys/net/if_media.h
Directory Properties:
  stable/7/sbin/ifconfig/   (props changed)
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sbin/ifconfig/ifmedia.c
==============================================================================
--- stable/7/sbin/ifconfig/ifmedia.c	Fri Jan 14 20:43:21 2011	(r217422)
+++ stable/7/sbin/ifconfig/ifmedia.c	Fri Jan 14 20:43:24 2011	(r217423)
@@ -416,6 +416,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;
@@ -424,7 +427,7 @@ struct ifmedia_type_to_subtype {
 	struct {
 		struct ifmedia_description *desc;
 		int alias;
-	} options[3];
+	} options[4];
 	struct {
 		struct ifmedia_description *desc;
 		int alias;
@@ -443,6 +446,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 },
 		},
@@ -460,6 +464,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 },
 		},
@@ -477,6 +482,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 },
 		},
@@ -494,6 +500,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 },
 		},
@@ -513,6 +520,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: stable/7/sys/net/if_media.h
==============================================================================
--- stable/7/sys/net/if_media.h	Fri Jan 14 20:43:21 2011	(r217422)
+++ stable/7/sys/net/if_media.h	Fri Jan 14 20:43:24 2011	(r217423)
@@ -594,6 +594,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.
  */