diff options
| author |   mpf <mpf@openbsd.org> | 2005-01-18 23:26:51 +0000 |
|---|---|---|
| committer | mpf <mpf@openbsd.org> | 2005-01-18 23:26:51 +0000 |
| commit | ba3c70d7ffadf03fe5752bc1ce61a0fe7fd8a15c (patch) | |
| tree | a710eddb832345d31581154a018a806312735bfd /sys/netinet6 | |
| parent | Use correct source address for ICMP errors generated from packets that were (diff) | |
| download | wireguard-openbsd-ba3c70d7ffadf03fe5752bc1ce61a0fe7fd8a15c.tar.xz wireguard-openbsd-ba3c70d7ffadf03fe5752bc1ce61a0fe7fd8a15c.zip | |
Rewriting the lladdr can now be done without using mbuf tags.
Advertisements run through the carp interface first.
So we just take the address from ifp0.
While we're there,
also remove carp_macmatch6, which isn't used anymore.
Proposed by mcbride@
ok mcbride@, pascoe@
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/nd6_nbr.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index a955650ac5e..a9a824f1dc6 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_nbr.c,v 1.35 2004/12/21 10:28:35 mcbride Exp $ */ +/* $OpenBSD: nd6_nbr.c,v 1.36 2005/01/18 23:26:52 mpf Exp $ */ /* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */ /* @@ -938,15 +938,7 @@ nd6_na_output(ifp, daddr6, taddr6, flags, tlladdr, sdl0) * my address) use lladdr configured for the interface. */ if (sdl0 == NULL) { -#if NCARP > 0 - if (ifp->if_carp && ifp->if_type != IFT_CARP) - mac = carp_macmatch6(ifp->if_carp, m, taddr6); - if (mac == NULL) - mac = nd6_ifptomac(ifp); -#else - mac = nd6_ifptomac(ifp); -#endif } else if (sdl0->sa_family == AF_LINK) { struct sockaddr_dl *sdl; sdl = (struct sockaddr_dl *)sdl0; |