diff options
| author | Florent Fourcot <florent.fourcot@enst-bretagne.fr> | 2013-12-10 15:15:46 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-10 22:51:00 -0500 |
| commit | ce7a3bdf18a8dbcba1409f5d335c56fde432ca89 (patch) | |
| tree | 09920c6ad1d400ddc0c92570786c0af9bef537c0 /net/l2tp | |
| parent | 9f70f46bd4c7267d48ef461a1d613ec9ec0d520c (diff) | |
| download | blackbird-op-linux-ce7a3bdf18a8dbcba1409f5d335c56fde432ca89.tar.gz blackbird-op-linux-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 <florent.fourcot@enst-bretagne.fr>
Reviewed-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_ip6.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c index d9b437e55007..bb6e206ea70b 100644 --- a/net/l2tp/l2tp_ip6.c +++ b/net/l2tp/l2tp_ip6.c @@ -528,7 +528,6 @@ static int l2tp_ip6_sendmsg(struct kiocb *iocb, struct sock *sk, flowlabel = fl6_sock_lookup(sk, fl6.flowlabel); if (flowlabel == NULL) return -EINVAL; - daddr = &flowlabel->dst; } } |
