diff options
| author | Camiel Dobbelaar <camield@cvs.openbsd.org> | 2012-10-08 18:48:26 +0000 |
|---|---|---|
| committer | Camiel Dobbelaar <camield@cvs.openbsd.org> | 2012-10-08 18:48:26 +0000 |
| commit | f4c749cef82e1deae9dd0c7231799ffaaf36e47f (patch) | |
| tree | 8105549b9c9de56e63ea66b15f710b2e82afa235 /sys/net | |
| parent | 5e089a91cb1949251f5810ccdfcb64d8102ef5ea (diff) | |
Make carp_ourether() shorter and more generic. Only a mac address
is really needed, instead of an ethernet header and selector.
ok mikeb henning mpf
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_bridge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index d62ba1b4712..0420fb98f08 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.198 2012/10/06 18:44:47 camield Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.199 2012/10/08 18:48:25 camield Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -1430,7 +1430,7 @@ bridge_input(struct ifnet *ifp, struct ether_header *eh, struct mbuf *m) if (bcmp(ac->ac_enaddr, eh->ether_dhost, ETHER_ADDR_LEN) == 0 #if NCARP > 0 || (ifl->ifp->if_carp && carp_ourether(ifl->ifp->if_carp, - eh, 0) != NULL) + (u_int8_t *)&eh->ether_dhost) != NULL) #endif ) { if (srcifl->bif_flags & IFBIF_LEARNING) @@ -1471,7 +1471,7 @@ bridge_input(struct ifnet *ifp, struct ether_header *eh, struct mbuf *m) if (bcmp(ac->ac_enaddr, eh->ether_shost, ETHER_ADDR_LEN) == 0 #if NCARP > 0 || (ifl->ifp->if_carp && carp_ourether(ifl->ifp->if_carp, - eh, 1) != NULL) + (u_int8_t *)&eh->ether_shost) != NULL) #endif ) { m_freem(m); |