diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-02-12 12:12:46 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-02-12 12:12:46 +0000 |
| commit | 662aad5bb9f48af2911dd44583d58c96e75c9e0d (patch) | |
| tree | 1470d95951b2a0822dd83d388dfd23b748dda77f /sys/netinet6 | |
| parent | 05d31d7299e510cc2fdfc8158181ee3862de6c06 (diff) | |
Remove a chunk that should have been deleted in r1.166, this was safe
because clearing fields twice is not a problem.
Yeah, I suck at applying diff.
ok henning@, claudio@
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/ip6_output.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index d8c49002851..b1838784307 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_output.c,v 1.166 2015/02/05 01:10:57 mpi Exp $ */ +/* $OpenBSD: ip6_output.c,v 1.167 2015/02/12 12:12:45 mpi Exp $ */ /* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */ /* @@ -768,18 +768,6 @@ reroute: * to any local address. In this case do not clear its scopes * to let ip6_input() find a matching local route. */ - if ((ifp->if_flags & IFF_LOOPBACK) == 0) { - if (IN6_IS_SCOPE_EMBED(&ip6->ip6_src)) - ip6->ip6_src.s6_addr16[1] = 0; - if (IN6_IS_SCOPE_EMBED(&ip6->ip6_dst)) - ip6->ip6_dst.s6_addr16[1] = 0; - } - - /* - * If the packet is not going on the wire it can be destinated - * to any local address. In this case do not clear its scopes - * to let ip6_input() find a matching local route. - */ if (ifp->if_flags & IFF_LOOPBACK) { if (IN6_IS_SCOPE_EMBED(&ip6->ip6_src)) ip6->ip6_src.s6_addr16[1] = src_scope; |