Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ac4f008 authored by Brian Haley's avatar Brian Haley Committed by David S. Miller
Browse files

[IPV6]: IPV6_MULTICAST_IF setting is ignored on link-local connect() 



Signed-off-by: default avatarBrian Haley <brian.haley@hp.com>
Acked-by: default avatarDavid L Stevens <dlstevens@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cf585ae8

net/ipv6/datagram.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -123,11 +123,11 @@ int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
				goto out;

				goto out;

			}

			}

			sk->sk_bound_dev_if = usin->sin6_scope_id;

			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 */

		/* Connect to link-local address requires an interface */

		if (!sk->sk_bound_dev_if) {

		if (!sk->sk_bound_dev_if) {

			err = -EINVAL;

			err = -EINVAL;