diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-11-19 09:00:44 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-11-19 09:00:44 +0000 |
| commit | 0fc771ffd7e04022d054d3b61e56d516bee559c0 (patch) | |
| tree | 5911c4463da89adf4e5a2a8eeae606b90912811b | |
| parent | efbfae6909b53fe9ddfbeafbd454210f2ac75f01 (diff) | |
Remove some FDDI/ATM leftovers.
ok mikeb@, henning@, deraadt@, brad@, miod@
| -rw-r--r-- | sys/arch/amd64/amd64/autoconf.c | 5 | ||||
| -rw-r--r-- | sys/arch/i386/i386/autoconf.c | 5 | ||||
| -rw-r--r-- | sys/net/if.c | 3 | ||||
| -rw-r--r-- | sys/netinet6/in6_ifattach.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/nd6_nbr.c | 3 |
5 files changed, 7 insertions, 13 deletions
diff --git a/sys/arch/amd64/amd64/autoconf.c b/sys/arch/amd64/amd64/autoconf.c index 55f241ffe90..e758fbf8aed 100644 --- a/sys/arch/amd64/amd64/autoconf.c +++ b/sys/arch/amd64/amd64/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.39 2012/09/19 20:19:31 jsg Exp $ */ +/* $OpenBSD: autoconf.c,v 1.40 2013/11/19 09:00:43 mpi Exp $ */ /* $NetBSD: autoconf.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */ /*- @@ -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) diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c index f5429788cf6..bc0e2c9de80 100644 --- a/sys/arch/i386/i386/autoconf.c +++ b/sys/arch/i386/i386/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.91 2012/09/19 20:19:31 jsg Exp $ */ +/* $OpenBSD: autoconf.c,v 1.92 2013/11/19 09:00:43 mpi Exp $ */ /* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */ /*- @@ -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) diff --git a/sys/net/if.c b/sys/net/if.c index 5a4a7998733..5fcefb67ef1 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.276 2013/11/18 09:16:30 mpi Exp $ */ +/* $OpenBSD: if.c,v 1.277 2013/11/19 09:00:43 mpi Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -1564,7 +1564,6 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p) switch (ifp->if_type) { case IFT_ETHER: case IFT_CARP: - case IFT_FDDI: case IFT_XETHER: case IFT_ISO88025: case IFT_L2VLAN: diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 6dade32d109..2f508db892b 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_ifattach.c,v 1.62 2013/10/17 16:27:45 bluhm Exp $ */ +/* $OpenBSD: in6_ifattach.c,v 1.63 2013/11/19 09:00:43 mpi Exp $ */ /* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */ /* @@ -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 */ diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 59af7e033ef..f8e82ef910a 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_nbr.c,v 1.71 2013/11/11 09:15:35 mpi Exp $ */ +/* $OpenBSD: nd6_nbr.c,v 1.72 2013/11/19 09:00:43 mpi Exp $ */ /* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */ /* @@ -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: |