aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/tcp_ipv6.c
diff options
context:
space:
mode:
authorFlorent Fourcot <[email protected]>2013-12-10 14:15:46 +0000
committerDavid S. Miller <[email protected]>2013-12-11 03:51:00 +0000
commitce7a3bdf18a8dbcba1409f5d335c56fde432ca89 (patch)
tree09920c6ad1d400ddc0c92570786c0af9bef537c0 /net/ipv6/tcp_ipv6.c
parentsctp: properly latch and use autoclose value from sock to association (diff)
downloadkernel-ce7a3bdf18a8dbcba1409f5d335c56fde432ca89.tar.gz
kernel-ce7a3bdf18a8dbcba1409f5d335c56fde432ca89.zip
ipv6: do not erase dst address with flow label destination
This patch is following b579035ff766c9412e2b92abf5cab794bff102b6 "ipv6: remove old conditions on flow label sharing" Since there is no reason to restrict a label to a destination, we should not erase the destination value of a socket with the value contained in the flow label storage. This patch allows to really have the same flow label to more than one destination. Signed-off-by: Florent Fourcot <[email protected]> Reviewed-by: Hannes Frederic Sowa <[email protected]> Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r--net/ipv6/tcp_ipv6.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 0740f93a114a..f67033b4bb66 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -156,7 +156,6 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);
if (flowlabel == NULL)
return -EINVAL;
- usin->sin6_addr = flowlabel->dst;
fl6_sock_release(flowlabel);
}
}