diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-11-23 13:32:26 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-11-23 13:32:26 +0000 |
| commit | 67465fd603d528f730e49f0421b671deabc7972e (patch) | |
| tree | 5de1d38aba2522b164cfb3f7425bb396d9c8d4d3 /sys/netinet | |
| parent | 602f72dea8011b7a9c702eebcd696f0439cf9502 (diff) | |
Replace non mp-safe carp_iamatch6() with mp-safe carp_iamatch().
They have the same functionnality since friehm@ cleaned up
balancing code.
ok florian@, visa@, patrick@, bluhm@, jmatthew@
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_carp.c | 18 | ||||
| -rw-r--r-- | sys/netinet/ip_carp.h | 3 |
2 files changed, 2 insertions, 19 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 7b4e0b194d5..50f37e2deaf 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.319 2017/11/21 09:08:55 patrick Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.320 2017/11/23 13:32:25 mpi Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -1352,22 +1352,6 @@ carp_iamatch(struct ifnet *ifp) return (match); } -#ifdef INET6 -int -carp_iamatch6(struct ifnet *ifp) -{ - struct carp_softc *sc = ifp->if_softc; - struct carp_vhost_entry *vhe = SRPL_FIRST_LOCKED(&sc->carp_vhosts); - - KERNEL_ASSERT_LOCKED(); /* touching carp_vhosts */ - - if (vhe->state == MASTER) - return (1); - - return (0); -} -#endif /* INET6 */ - struct ifnet * carp_ourether(void *v, u_int8_t *ena) { diff --git a/sys/netinet/ip_carp.h b/sys/netinet/ip_carp.h index 612b9a20952..5d401ed8049 100644 --- a/sys/netinet/ip_carp.h +++ b/sys/netinet/ip_carp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.h,v 1.43 2017/05/30 12:09:27 friehm Exp $ */ +/* $OpenBSD: ip_carp.h,v 1.44 2017/11/23 13:32:25 mpi Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -199,7 +199,6 @@ void carp_carpdev_state(void *); void carp_group_demote_adj(struct ifnet *, int, char *); int carp6_proto_input(struct mbuf **, int *, int, int); int carp_iamatch(struct ifnet *); -int carp_iamatch6(struct ifnet *); struct ifnet *carp_ourether(void *, u_int8_t *); int carp_output(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); |