diff options
author | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2004-12-17 12:42:03 +0000 |
---|---|---|
committer | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2004-12-17 12:42:03 +0000 |
commit | 00cabea6fcdbcf8569fba0e1263ab451f1cdf325 (patch) | |
tree | af618745f40973d7af5d616f304616ed17c64d0e /sys/netinet/ip_carp.h | |
parent | 4b8b00a64383f5942e6ec2170da2236e0ad29722 (diff) |
Reorder code in the ethernet output path, and enhance unicast address
matching in the bridge receive path to make CARP operate correctly
on physical interfaces that are participating in a bridge.
ok mcbride@ henning@ dlg@
Diffstat (limited to 'sys/netinet/ip_carp.h')
-rw-r--r-- | sys/netinet/ip_carp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/netinet/ip_carp.h b/sys/netinet/ip_carp.h index 86cafdb5f7a..879e6f1cab6 100644 --- a/sys/netinet/ip_carp.h +++ b/sys/netinet/ip_carp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.h,v 1.13 2004/12/15 14:01:03 pat Exp $ */ +/* $OpenBSD: ip_carp.h,v 1.14 2004/12/17 12:42:01 pascoe Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -162,6 +162,7 @@ int carp_iamatch(void *, struct in_ifaddr *, struct in_addr *, u_int8_t **); struct ifaddr *carp_iamatch6(void *, struct in6_addr *); void *carp_macmatch6(void *, struct mbuf *, struct in6_addr *); +struct ifnet *carp_ourether(void *, struct ether_header *, int); int carp_input(struct ether_header *, struct mbuf *); int carp_sysctl(int *, u_int, void *, size_t *, void *, size_t); #endif /* _KERNEL */ |