| Message ID | 4ED3394E.7050602@cn.fujitsu.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Li Wei <lw@cn.fujitsu.com> Date: Mon, 28 Nov 2011 15:33:34 +0800 > We need to set np->mcast_hops to it's default value at this moment > otherwise when we use it and found it's value is -1, the logic to > get default hop limit doesn't take multicast into account and will > return wrong hop limit(IPV6_DEFAULT_HOPLIMIT) which is for unicast. > > Signed-off-by: Li Wei <lw@cn.fujitsu.com> Applied, thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index c99e3ee..26cb08c 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -503,7 +503,7 @@ done: goto e_inval; if (val > 255 || val < -1) goto e_inval; - np->mcast_hops = val; + np->mcast_hops = (val == -1 ? IPV6_DEFAULT_MCASTHOPS : val); retv = 0; break;
We need to set np->mcast_hops to it's default value at this moment otherwise when we use it and found it's value is -1, the logic to get default hop limit doesn't take multicast into account and will return wrong hop limit(IPV6_DEFAULT_HOPLIMIT) which is for unicast. Signed-off-by: Li Wei <lw@cn.fujitsu.com> --- net/ipv6/ipv6_sockglue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)