diff options
| author | Brian Haley <brian.haley@hp.com> | 2008-01-08 23:52:21 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-08 23:52:21 -0800 |
| commit | 1ac4f008857487bf45b709248d71c5b3f4cae7b5 (patch) | |
| tree | 2707737e530e1887ff1b24731a7f2d489264aa9a | |
| parent | cf585ae8ae9ac7287a6d078425ea32f22bf7f1f7 (diff) | |
| download | linux-stable-1ac4f008857487bf45b709248d71c5b3f4cae7b5.tar.gz linux-stable-1ac4f008857487bf45b709248d71c5b3f4cae7b5.tar.bz2 linux-stable-1ac4f008857487bf45b709248d71c5b3f4cae7b5.zip | |
[IPV6]: IPV6_MULTICAST_IF setting is ignored on link-local connect()
Signed-off-by: Brian Haley <brian.haley@hp.com>
Acked-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/datagram.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 2ed689ac449e..5d4245ab4183 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -123,11 +123,11 @@ ipv4_connected: goto out; } sk->sk_bound_dev_if = usin->sin6_scope_id; - if (!sk->sk_bound_dev_if && - (addr_type & IPV6_ADDR_MULTICAST)) - fl.oif = np->mcast_oif; } + if (!sk->sk_bound_dev_if && (addr_type & IPV6_ADDR_MULTICAST)) + sk->sk_bound_dev_if = np->mcast_oif; + /* Connect to link-local address requires an interface */ if (!sk->sk_bound_dev_if) { err = -EINVAL; |