From 4c1aecad9415334f2551e96b12ad9edc7548173b Mon Sep 17 00:00:00 2001 From: thompsa Date: Tue, 7 Mar 2006 21:40:44 +0000 Subject: Further refine the bridge hack in the arp code. Only do the special arp handling for interfaces which are actually in the bridge group, ignore all others. MFC after: 3 days --- sys/netinet/if_ether.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 2128d70..ad5de6c 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -631,7 +631,7 @@ in_arpinput(m) * XXX: This is really ugly! */ LIST_FOREACH(ia, INADDR_HASH(itaddr.s_addr), ia_hash) { - if (((bridged && ia->ia_ifp->if_type != IFT_BRIDGE) || + if (((bridged && ia->ia_ifp->if_bridge != NULL) || (ia->ia_ifp == ifp)) && itaddr.s_addr == ia->ia_addr.sin_addr.s_addr) goto match; @@ -645,7 +645,7 @@ in_arpinput(m) #endif } LIST_FOREACH(ia, INADDR_HASH(isaddr.s_addr), ia_hash) - if (((bridged && ia->ia_ifp->if_type != IFT_BRIDGE) || + if (((bridged && ia->ia_ifp->if_bridge != NULL) || (ia->ia_ifp == ifp)) && isaddr.s_addr == ia->ia_addr.sin_addr.s_addr) goto match; -- cgit v1.1