diff options
| author | luigi <luigi@FreeBSD.org> | 2001-02-10 00:10:18 +0000 |
|---|---|---|
| committer | luigi <luigi@FreeBSD.org> | 2001-02-10 00:10:18 +0000 |
| commit | bc66105b1dd64dd9599a78cd769be24fc39b89ea (patch) | |
| tree | f2ecbab7993f781ecaad9607cce4fad0163a4001 /sys/netinet/if_ether.c | |
| parent | ca76da11764ea0bc1e044049f7a5c30eedfc8c7e (diff) | |
| download | FreeBSD-src-bc66105b1dd64dd9599a78cd769be24fc39b89ea.zip FreeBSD-src-bc66105b1dd64dd9599a78cd769be24fc39b89ea.tar.gz | |
Sync with the bridge/dummynet/ipfw code already tested in stable.
In ip_fw.[ch] change a couple of variable and field names to
avoid having types, variables and fields with the same name.
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 a9c54fd..49d1189 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)) { |
