diff options
Diffstat (limited to 'sys/netinet/if_ether.c')
| -rw-r--r-- | sys/netinet/if_ether.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index c9f459f24b2..9dd619da153 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ether.c,v 1.93 2011/09/18 11:17:58 miod Exp $ */ +/* $OpenBSD: if_ether.c,v 1.94 2012/10/05 12:30:43 camield Exp $ */ /* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */ /* @@ -671,7 +671,9 @@ in_arpinput(struct mbuf *m) ac->ac_if.if_xname); goto out; } else if (rt->rt_ifp != &ac->ac_if) { +#if NCARP > 0 if (ac->ac_if.if_type != IFT_CARP) +#endif log(LOG_WARNING, "arp: attempt to overwrite entry for" " %s on %s by %s on %s\n", @@ -695,13 +697,13 @@ in_arpinput(struct mbuf *m) rt->rt_ifp->if_carpdev == &ac->ac_if) && !(ac->ac_if.if_type == IFT_CARP && ac->ac_if.if_carpdev == rt->rt_ifp)) { - log(LOG_WARNING, - "arp: attempt to add entry for %s " - "on %s by %s on %s\n", - inet_ntoa(isaddr), rt->rt_ifp->if_xname, - ether_sprintf(ea->arp_sha), - ac->ac_if.if_xname); - goto out; + log(LOG_WARNING, + "arp: attempt to add entry for %s " + "on %s by %s on %s\n", + inet_ntoa(isaddr), rt->rt_ifp->if_xname, + ether_sprintf(ea->arp_sha), + ac->ac_if.if_xname); + goto out; } bcopy(ea->arp_sha, LLADDR(sdl), sdl->sdl_alen = sizeof(ea->arp_sha)); |