diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-11-02 15:05:24 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-11-02 15:05:24 +0000 |
| commit | ebc9c8b4120b7cb939584ce73e4db6b3c6c98fe8 (patch) | |
| tree | ef70f25634ef86770acdd48ab75467b4e5b886b4 /sys/netinet6/in6.c | |
| parent | 5b84d5478b4813f32f8eb420a1b25c7bb61908bd (diff) | |
Retire ARP load-balacing, thanks for all the fish!
One of the keys of our MP work relies on making OpenBSD's kernel simpler!
In this case turning ARP processing MP-safe is quite complicated due to
the way carp(4) is hooked in arpinput() and nowadays you'd better run
kitchensinkd(9) anyway :)
ok bluhm@, claudio@, reyk@
Diffstat (limited to 'sys/netinet6/in6.c')
| -rw-r--r-- | sys/netinet6/in6.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 423c0f620e3..402199b9ca4 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.c,v 1.177 2015/10/30 09:39:42 bluhm Exp $ */ +/* $OpenBSD: in6.c,v 1.178 2015/11/02 15:05:23 mpi Exp $ */ /* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */ /* @@ -1648,9 +1648,6 @@ in6_ifawithscope(struct ifnet *oifp, struct in6_addr *dst, u_int rdomain) struct ifaddr *ifa; struct ifnet *ifp; struct in6_ifaddr *ia6_best = NULL; -#if NCARP > 0 - struct sockaddr_dl *proxydl = NULL; -#endif if (oifp == NULL) { printf("in6_ifawithscope: output interface is not specified\n"); @@ -1670,8 +1667,7 @@ in6_ifawithscope(struct ifnet *oifp, struct in6_addr *dst, u_int rdomain) * Never use a carp address of an interface which is not * the master. */ - if (ifp->if_type == IFT_CARP && - !carp_iamatch6(ifp, NULL, &proxydl)) + if (ifp->if_type == IFT_CARP && !carp_iamatch6(ifp)) continue; #endif |