diff options
author | Qing Li <qingli@FreeBSD.org> | 2011-10-16 22:15:13 +0000 |
---|---|---|
committer | Qing Li <qingli@FreeBSD.org> | 2011-10-16 22:15:13 +0000 |
commit | e74eb12c684928ac8ded37b73541bc24b42d03a2 (patch) | |
tree | dc9c2a39d40c4fbf574ae9b4bdc3249b3aed5034 /sys/netinet6 | |
parent | e8cc80c0a07bf3235090c7d32b7b6b746842eba8 (diff) | |
download | src-e74eb12c684928ac8ded37b73541bc24b42d03a2.tar.gz src-e74eb12c684928ac8ded37b73541bc24b42d03a2.zip |
The IPv6 code was influx at the time of r196865 due to the L2/L3
separation rewrite changes. r196865 was committed to fix a scope
violation problem in the following test scenario:
box-1# ifconfig em0 inet6 2001:db8:1:: prefixlen 64 anycast
box-1# ifconfig em1 inet6 2001:db8:2::1 prefixlen 64
box-2# ifconfig re0 inet6 2001:db8:1::6 prefixlen 64
em0 and re0 are on the same link.
box-2# ping6 2001:db8:1::
PING6(56=40+8+8 bytes) 2001:db8:1::6 --> 2001:db8:1::
the ICMPv6 response should have a source address of em1, which
is 2001:db8:2::1, not the link-local address of em0.
That code is no longer necessary and breaks the IPv6-Ready logo
testing, so revert it now.
Reviewed by: hrs
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=226451
Diffstat (limited to 'sys/netinet6')
-rw-r--r-- | sys/netinet6/icmp6.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 6a2da07341f6..d22bc43e5e1d 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2244,10 +2244,6 @@ icmp6_reflect(struct mbuf *m, size_t off) } } - if ((srcp != NULL) && - (in6_addrscope(srcp) != in6_addrscope(&ip6->ip6_src))) - srcp = NULL; - if (srcp == NULL) { int e; struct sockaddr_in6 sin6; |