summaryrefslogtreecommitdiff
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-03 23:42:27 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-02 10:26:24 -0700
commit69bae45922d9df8d922d884ddcf1d3c49bd1ba56 (patch)
tree418441033e97f6244febd1e644c2da6ec01b9fee /net/ipv6
parent8a8641620981ea60268d86b1d8107160ff0ab4d5 (diff)
downloadlwn-69bae45922d9df8d922d884ddcf1d3c49bd1ba56.tar.gz
lwn-69bae45922d9df8d922d884ddcf1d3c49bd1ba56.zip
ipv6: Fix default multicast hops setting.
[ Upstream commit f935aa9e99d6ec74a50871c120e6b21de7256efb ] As per RFC 3493 the default multicast hops setting for a socket should be "1" just like ipv4. Ironically we have a IPV6_DEFAULT_MCASTHOPS macro it just wasn't being used. Reported-by: Elliot Hughes <enh@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/af_inet6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 12e69d364dd5..3c1191374ef8 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -199,7 +199,7 @@ lookup_protocol:
inet_sk(sk)->pinet6 = np = inet6_sk_generic(sk);
np->hop_limit = -1;
- np->mcast_hops = -1;
+ np->mcast_hops = IPV6_DEFAULT_MCASTHOPS;
np->mc_loop = 1;
np->pmtudisc = IPV6_PMTUDISC_WANT;
np->ipv6only = net->ipv6.sysctl.bindv6only;