summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authorRyan Thomas McBride <mcbride@cvs.openbsd.org>2004-10-06 03:56:09 +0000
committerRyan Thomas McBride <mcbride@cvs.openbsd.org>2004-10-06 03:56:09 +0000
commit7b5b863da2ace34d46f64fa7ef8988fb07928f12 (patch)
tree162baeee636553e111458eb35da819437db93b76 /sys/netinet
parent2efe64fea91057d48c6e4d13ca44d28a6500236e (diff)
Unbreak tcpdump on the carp interface; variable shadowing pointed out by
Patrick Latifi (diff based on his).
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_carp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 5c620aae863..9efa52d988e 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_carp.c,v 1.66 2004/10/05 18:08:41 mcbride Exp $ */
+/* $OpenBSD: ip_carp.c,v 1.67 2004/10/06 03:56:08 mcbride Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -494,11 +494,11 @@ carp_input_c(struct mbuf *m, struct carp_header *ch, sa_family_t af)
* try to free it or keep a pointer to it).
*/
struct mbuf m0;
- u_int32_t af = htonl(af);
+ u_int32_t af0 = htonl(af);
m0.m_next = m;
- m0.m_len = sizeof(af);
- m0.m_data = (char *)&af;
+ m0.m_len = sizeof(af0);
+ m0.m_data = (char *)&af0;
bpf_mtap(sc->sc_ac.ac_if.if_bpf, &m0);
}
#endif