Buildworld broken on amd64

[Doug Ambrisko]

Steve Kargl writes:
| cc -O2 -fno-strict-aliasing -pipe -march=opteron -Wall -Wmissing-prototypes -Wcast-qual -Wwrite
| -strings -Wnested-externs -DRESCUE  -c /usr/src/sbin/ifconfig/ifmedia.c
| /usr/src/sbin/ifconfig/ifmedia.c:345: error: `IFM_10GBASE_SR' undeclared here (not in a functio
| n)
| /usr/src/sbin/ifconfig/ifmedia.c:345: error: initializer element is not constant
| /usr/src/sbin/ifconfig/ifmedia.c:345: error: (near initialization for `ifm_subtype_ethernet_des
| criptions[16].ifmt_word')
| /usr/src/sbin/ifconfig/ifmedia.c:345: error: initializer element is not constant
| /usr/src/sbin/ifconfig/ifmedia.c:345: error: (near initialization for `ifm_subtype_ethernet_des
| criptions[16]')
| /usr/src/sbin/ifconfig/ifmedia.c:345: error: `IFM_10GBASE_LR' undeclared here (not in a functio
| n)
| /usr/src/sbin/ifconfig/ifmedia.c:345: error: initializer element is not constant
| /usr/src/sbin/ifconfig/ifmedia.c:345: error: (near initialization for `ifm_subtype_ethernet_des
| criptions[17].ifmt_word')
| /usr/src/sbin/ifconfig/ifmedia.c:345: error: initializer element is not constant
| /usr/src/sbin/ifconfig/ifmedia.c:345: error: (near initialization for `ifm_subtype_ethernet_des
| criptions[17]')
| /usr/src/sbin/ifconfig/ifmedia.c:345: error: initializer element is not constant
| /usr/src/sbin/ifconfig/ifmedia.c:345: error: (near initialization for `ifm_subtype_ethernet_des
| criptions[18]')
| *** Error code 1
| 
| Stop in /usr/src/sbin/ifconfig.
| *** Error code 1
| 
| Stop in /usr/obj/usr/src/rescue/rescue.
| *** Error code 1

I think the commit to if_media.h broke it.  Try:

Index: if_media.h
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sys/net/if_media.h,v
retrieving revision 1.31
diff -u -p -r1.31 if_media.h
--- if_media.h	14 Feb 2006 12:10:03 -0000	1.31
+++ if_media.h	14 Feb 2006 22:33:28 -0000
@@ -328,8 +328,8 @@ struct ifmedia_description {
 	{ IFM_1000_T,	"1000baseTX" },					\
 	{ IFM_1000_T,	"1000baseT" },					\
 	{ IFM_HPNA_1,	"homePNA" },					\
-	{ IFM_10GBASE_SR, "10GBASE-SR" },				\
-	{ IFM_10GBASE_LR, "10GBASE-LR" },				\
+	{ IFM_10G_SR,	"10GBASE-SR" },				\
+	{ IFM_10G_LR,	"10GBASE-LR" },				\
 	{ 0, NULL },							\
 }
 
to fix it.  I'm not sure why 18/19 where flipped.  Maybe to sync. with
NetBSD?

Doug A.