diff options
| author | thompsa <thompsa@FreeBSD.org> | 2006-01-29 23:21:01 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2006-01-29 23:21:01 +0000 |
| commit | 1d1f425293b142dc1aec01b438a9ee5fa70409e7 (patch) | |
| tree | 27ca30ce2db1f7a256282cc53ce4baaac6b5ec71 /sys/netinet/if_ether.c | |
| parent | d2e57118c5ce205d4d4301418c8fd4e0e709fedc (diff) | |
| download | FreeBSD-src-1d1f425293b142dc1aec01b438a9ee5fa70409e7.zip FreeBSD-src-1d1f425293b142dc1aec01b438a9ee5fa70409e7.tar.gz | |
Back out of r1.148, it causes two arp replies to be sent with different mac
addresses. One for the bridged interface with the IP address assigned but then
another with the mac for the bridge itself.
Diffstat (limited to 'sys/netinet/if_ether.c')
| -rw-r--r-- | sys/netinet/if_ether.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 620317f..28f7d44 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -607,7 +607,7 @@ in_arpinput(m) int carp_match = 0; #endif - if (ifp->if_bridge || ifp->if_type == IFT_BRIDGE) + if (ifp->if_bridge) bridged = 1; req_len = arphdr_len2(ifp->if_addrlen, sizeof(struct in_addr)); |
