diff options
| author |   henning <henning@openbsd.org> | 2004-10-28 20:34:57 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2004-10-28 20:34:57 +0000 |
| commit | f4433d56f2503f1e9473f6d84099a1b1dee48259 (patch) | |
| tree | d06a5b478f280c32f838f9a9f909b6ed37cba2c6 | |
| parent | define IFT_CARP, and set if_type to that on carp interfaces instead (diff) | |
| download | wireguard-openbsd-f4433d56f2503f1e9473f6d84099a1b1dee48259.tar.xz wireguard-openbsd-f4433d56f2503f1e9473f6d84099a1b1dee48259.zip | |
treat IFT_CARP like IFT_PROPVIRTUAL, ryan daniel ok
| -rw-r--r-- | sys/netinet6/nd6.c | 3 | ||||
| -rw-r--r-- | sys/netinet6/nd6_nbr.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 22bd57c33d3..e29ff4b259f 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6.c,v 1.67 2004/06/21 23:50:37 tholo Exp $ */ +/* $OpenBSD: nd6.c,v 1.68 2004/10/28 20:34:57 henning Exp $ */ /* $KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $ */ /* @@ -1926,6 +1926,7 @@ nd6_need_cache(ifp) case IFT_PROPVIRTUAL: case IFT_L2VLAN: case IFT_IEEE80211: + case IFT_CARP: case IFT_GIF: /* XXX need more cases? */ return (1); default: diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index d5ca6d3875a..da0e4adac9b 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_nbr.c,v 1.33 2003/10/31 09:00:32 mcbride Exp $ */ +/* $OpenBSD: nd6_nbr.c,v 1.34 2004/10/28 20:34:57 henning Exp $ */ /* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */ /* @@ -1006,6 +1006,7 @@ nd6_ifptomac(ifp) case IFT_FDDI: case IFT_IEEE1394: case IFT_PROPVIRTUAL: + case IFT_CARP: case IFT_L2VLAN: case IFT_IEEE80211: return ((caddr_t)(ifp + 1)); |