summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpf <mpf@openbsd.org>2007-06-01 02:42:59 +0000
committermpf <mpf@openbsd.org>2007-06-01 02:42:59 +0000
commit4a4b3ec73009b81a7cb73c8a895f78ccbac6f79f (patch)
tree6c2796023e32f34a6d29eb7c56d8ef7f2331b8e2
parentsince real boottime vnd support would have caused many problems, (diff)
downloadwireguard-openbsd-4a4b3ec73009b81a7cb73c8a895f78ccbac6f79f.tar.xz
wireguard-openbsd-4a4b3ec73009b81a7cb73c8a895f78ccbac6f79f.zip
sc_carplladdr does not need to be dereferenced.
OK mcbride@
-rw-r--r--sys/netinet/ip_carp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index d475d90ac18..67a0a53dedc 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_carp.c,v 1.143 2007/06/01 00:52:38 henning Exp $ */
+/* $OpenBSD: ip_carp.c,v 1.144 2007/06/01 02:42:59 mpf Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -266,7 +266,7 @@ carp_hmac_prepare_ctx(struct carp_softc *sc, u_int8_t ctx)
sc->sc_hashkey[1] = kmd[2] ^ kmd[3];
/* the rest of the precomputation */
- if (bcmp(sc->sc_ac.ac_enaddr, &sc->sc_carplladdr, ETHER_ADDR_LEN) != 0)
+ if (bcmp(sc->sc_ac.ac_enaddr, sc->sc_carplladdr, ETHER_ADDR_LEN) != 0)
SHA1Update(&sc->sc_sha1[ctx], sc->sc_ac.ac_enaddr,
ETHER_ADDR_LEN);
@@ -1796,7 +1796,7 @@ carp_set_enaddr(struct carp_softc *sc)
sc->sc_carplladdr[4] = 1;
sc->sc_carplladdr[5] = sc->sc_vhid;
} else
- bzero(&sc->sc_carplladdr, ETHER_ADDR_LEN);
+ bzero(sc->sc_carplladdr, ETHER_ADDR_LEN);
/*
* Use the carp lladdr if the running one isn't manually set.