diff options
| author | Luigi Rizzo <luigi@FreeBSD.org> | 2001-02-10 00:10:18 +0000 |
|---|---|---|
| committer | Luigi Rizzo <luigi@FreeBSD.org> | 2001-02-10 00:10:18 +0000 |
| commit | 7e1cd0d23d0331e11650f89caadd8d1815aa53b2 (patch) | |
| tree | 540c704f3e1c9da640791ff4c4217b360f027c93 /sys/netinet/if_ether.c | |
| parent | 7a504379b74488cf6d1614f1af703823a58a0aea (diff) | |
Notes
Diffstat (limited to 'sys/netinet/if_ether.c')
| -rw-r--r-- | sys/netinet/if_ether.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index a9c54fdcb2d3..49d1189936fb 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -569,20 +569,15 @@ in_arpinput(m) } la = arplookup(isaddr.s_addr, itaddr.s_addr == myaddr.s_addr, 0); if (la && (rt = la->la_rt) && (sdl = SDL(rt->rt_gateway))) { -#ifdef BRIDGE - if (!do_bridge) { /* the following is not an error when doing bridging */ -#else - { -#endif - if (rt->rt_ifp != &ac->ac_if) { - if (log_arp_wrong_iface) + /* the following is not an error when doing bridging */ + if (!BRIDGE_TEST && rt->rt_ifp != &ac->ac_if) { + if (log_arp_wrong_iface) log(LOG_ERR, "arp: %s is on %s%d but got reply from %6D on %s%d\n", inet_ntoa(isaddr), rt->rt_ifp->if_name, rt->rt_ifp->if_unit, ea->arp_sha, ":", ac->ac_if.if_name, ac->ac_if.if_unit); - goto reply; - } + goto reply; } if (sdl->sdl_alen && bcmp((caddr_t)ea->arp_sha, LLADDR(sdl), sdl->sdl_alen)) { |