From: Brian Haley <brian.haley@hp.com>
Date: Wed, 9 Jan 2008 07:52:21 +0000 (-0800)
Subject: [IPV6]: IPV6_MULTICAST_IF setting is ignored on link-local connect()
X-Git-Tag: v2.6.24-rc8~54^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ac4f008857487bf45b709248d71c5b3f4cae7b5;p=linux-2.6

[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>
---

diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 2ed689ac44..5d4245ab41 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;