Since we don't support any FDDI or ATM interfaces anymore, remove some
special cases for such interface types in our kernel.
ok?
Index: arch//amd64/amd64/autoconf.c
===================================================================
RCS file: /home/ncvs/src/sys/arch/amd64/amd64/autoconf.c,v
retrieving revision 1.39
diff -u -p -r1.39 autoconf.c
--- arch//amd64/amd64/autoconf.c 19 Sep 2012 20:19:31 -0000 1.39
+++ arch//amd64/amd64/autoconf.c 15 Nov 2013 14:08:14 -0000
@@ -198,8 +198,7 @@ diskconf(void)
for (ifp = TAILQ_FIRST(&ifnet); ifp != NULL;
ifp = TAILQ_NEXT(ifp, if_list)) {
- if ((ifp->if_type == IFT_ETHER ||
- ifp->if_type == IFT_FDDI) &&
+ if (ifp->if_type == IFT_ETHER &&
bcmp(bios_bootmac->mac,
((struct arpcom *)ifp)->ac_enaddr,
ETHER_ADDR_LEN) == 0)
Index: arch//i386/i386/autoconf.c
===================================================================
RCS file: /home/ncvs/src/sys/arch/i386/i386/autoconf.c,v
retrieving revision 1.91
diff -u -p -r1.91 autoconf.c
--- arch//i386/i386/autoconf.c 19 Sep 2012 20:19:31 -0000 1.91
+++ arch//i386/i386/autoconf.c 15 Nov 2013 14:08:14 -0000
@@ -196,8 +196,7 @@ diskconf(void)
for (ifp = TAILQ_FIRST(&ifnet); ifp != NULL;
ifp = TAILQ_NEXT(ifp, if_list)) {
- if ((ifp->if_type == IFT_ETHER ||
- ifp->if_type == IFT_FDDI) &&
+ if (ifp->if_type == IFT_ETHER &&
bcmp(bios_bootmac->mac,
((struct arpcom *)ifp)->ac_enaddr,
ETHER_ADDR_LEN) == 0)
Index: net/if.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if.c,v
retrieving revision 1.275
diff -u -p -r1.275 if.c
--- net/if.c 11 Nov 2013 09:15:34 -0000 1.275
+++ net/if.c 15 Nov 2013 14:08:15 -0000
@@ -1569,7 +1569,6 @@ ifioctl(struct socket *so, u_long cmd, c
switch (ifp->if_type) {
case IFT_ETHER:
case IFT_CARP:
- case IFT_FDDI:
case IFT_XETHER:
case IFT_ISO88025:
case IFT_L2VLAN:
Index: netinet6/in6_ifattach.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/in6_ifattach.c,v
retrieving revision 1.62
diff -u -p -r1.62 in6_ifattach.c
--- netinet6/in6_ifattach.c 17 Oct 2013 16:27:45 -0000 1.62
+++ netinet6/in6_ifattach.c 15 Nov 2013 14:08:15 -0000
@@ -189,8 +189,6 @@ found:
/* IEEE802/EUI64 cases - what others? */
case IFT_ETHER:
case IFT_CARP:
- case IFT_FDDI:
- case IFT_ATM:
case IFT_IEEE1394:
case IFT_IEEE80211:
/* look at IEEE802/EUI64 only */
Index: netinet6/nd6_nbr.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/nd6_nbr.c,v
retrieving revision 1.71
diff -u -p -r1.71 nd6_nbr.c
--- netinet6/nd6_nbr.c 11 Nov 2013 09:15:35 -0000 1.71
+++ netinet6/nd6_nbr.c 15 Nov 2013 14:08:15 -0000
@@ -1061,7 +1061,6 @@ nd6_ifptomac(struct ifnet *ifp)
{
switch (ifp->if_type) {
case IFT_ETHER:
- case IFT_FDDI:
case IFT_IEEE1394:
case IFT_PROPVIRTUAL:
case IFT_CARP:
