diff options
author | 2014-03-26 15:13:59 +0000 | |
---|---|---|
committer | 2014-03-26 15:13:59 +0000 | |
commit | a8472afc58dc56bd442e1ac8089556ce2e561b95 (patch) | |
tree | a4b5e669e7a0a7bbcec0be5004611cbc27ae94c2 | |
parent | Add a CONTEXT section. (diff) | |
download | wireguard-openbsd-a8472afc58dc56bd442e1ac8089556ce2e561b95.tar.xz wireguard-openbsd-a8472afc58dc56bd442e1ac8089556ce2e561b95.zip |
bcmp -> memcmp
-rw-r--r-- | sys/net/if_ethersubr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 98ef35eb456..9b283fbadb1 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ethersubr.c,v 1.163 2014/03/26 10:46:53 mpi Exp $ */ +/* $OpenBSD: if_ethersubr.c,v 1.164 2014/03/26 15:13:59 mpi Exp $ */ /* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */ /* @@ -382,7 +382,8 @@ ether_output(struct ifnet *ifp0, struct mbuf *m0, struct sockaddr *dst, goto bad; } #endif - if (!bcmp(&ifp->if_bridgeport, mtag + 1, sizeof(caddr_t))) + if (!memcmp(&ifp->if_bridgeport, mtag + 1, + sizeof(caddr_t))) break; } if (mtag == NULL) { @@ -493,7 +494,7 @@ ether_input(struct ifnet *ifp0, struct ether_header *eh, struct mbuf *m) } } - if (bcmp((caddr_t)etherbroadcastaddr, (caddr_t)eh->ether_dhost, + if (memcmp(etherbroadcastaddr, eh->ether_dhost, sizeof(etherbroadcastaddr)) == 0) m->m_flags |= M_BCAST; else @@ -582,8 +583,7 @@ ether_input(struct ifnet *ifp0, struct ether_header *eh, struct mbuf *m) */ if ((m->m_flags & (M_BCAST|M_MCAST)) == 0 && ((ifp->if_flags & IFF_PROMISC) || (ifp0->if_flags & IFF_PROMISC))) { - if (bcmp(ac->ac_enaddr, (caddr_t)eh->ether_dhost, - ETHER_ADDR_LEN)) { + if (memcmp(ac->ac_enaddr, eh->ether_dhost, ETHER_ADDR_LEN)) { m_freem(m); return; } @@ -1031,7 +1031,7 @@ ether_addmulti(struct ifreq *ifr, struct arpcom *ac) enm->enm_refcount = 1; LIST_INSERT_HEAD(&ac->ac_multiaddrs, enm, enm_list); ac->ac_multicnt++; - if (bcmp(addrlo, addrhi, ETHER_ADDR_LEN) != 0) + if (memcmp(addrlo, addrhi, ETHER_ADDR_LEN) != 0) ac->ac_multirangecnt++; splx(s); /* @@ -1079,7 +1079,7 @@ ether_delmulti(struct ifreq *ifr, struct arpcom *ac) LIST_REMOVE(enm, enm_list); free(enm, M_IFMADDR); ac->ac_multicnt--; - if (bcmp(addrlo, addrhi, ETHER_ADDR_LEN) != 0) + if (memcmp(addrlo, addrhi, ETHER_ADDR_LEN) != 0) ac->ac_multirangecnt--; splx(s); /* |