diff options
| author | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2007-06-01 00:07:14 +0000 |
|---|---|---|
| committer | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2007-06-01 00:07:14 +0000 |
| commit | de25703b03d0b81b319602e0e00a300f49f80058 (patch) | |
| tree | a176d9ba91e9891c3944d7ccf5110eb5b37eb44f /sys | |
| parent | 7baea4a238b57402abb2d4d5832affc4b084db6b (diff) | |
Remove code to create a carp(4) Token Ring lladdr.
OK mcbride@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/ip_carp.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index db2d02851c9..75ffd7d15c6 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.141 2007/05/29 18:21:19 claudio Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.142 2007/06/01 00:07:13 mpf Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -1786,24 +1786,15 @@ carp_set_enaddr(struct carp_softc *sc) { if (sc->sc_vhid != -1 && sc->sc_carpdev) { /* XXX detach ipv6 link-local address? */ - if (sc->sc_carpdev->if_type == IFT_ISO88025) { - sc->sc_carplladdr[0] = 3; - sc->sc_carplladdr[1] = 0; - sc->sc_carplladdr[2] = 0x40 >> (sc->sc_vhid - 1); - sc->sc_carplladdr[3] = 0x40000 >> (sc->sc_vhid - 1); - sc->sc_carplladdr[4] = 0; - sc->sc_carplladdr[5] = 0; - } else { - if (sc->sc_if.if_flags & IFF_LINK2) - sc->sc_carplladdr[0] = 1; - else - sc->sc_carplladdr[0] = 0; - sc->sc_carplladdr[1] = 0; - sc->sc_carplladdr[2] = 0x5e; - sc->sc_carplladdr[3] = 0; - sc->sc_carplladdr[4] = 1; - sc->sc_carplladdr[5] = sc->sc_vhid; - } + if (sc->sc_if.if_flags & IFF_LINK2) + sc->sc_carplladdr[0] = 1; + else + sc->sc_carplladdr[0] = 0; + sc->sc_carplladdr[1] = 0; + sc->sc_carplladdr[2] = 0x5e; + sc->sc_carplladdr[3] = 0; + sc->sc_carplladdr[4] = 1; + sc->sc_carplladdr[5] = sc->sc_vhid; } else bzero(&sc->sc_carplladdr, ETHER_ADDR_LEN); |