aboutsummaryrefslogtreecommitdiff
path: root/net/ipv6/ip6_input.c
diff options
context:
space:
mode:
authorAngga <Hermin.Anggawijaya@alliedtelesis.co.nz>2015-07-03 14:40:52 +1200
committerDavid S. Miller <davem@davemloft.net>2015-07-03 09:52:38 -0700
commit4c938d22c88a9ddccc8c55a85e0430e9c62b1ac5 (patch)
tree3c6568a1325b7dfa9d6e2377ba66842bb08a7950 /net/ipv6/ip6_input.c
parent92b80eb33c52583b48ed289bd993579b87b52d9a (diff)
downloadlinux-stericsson-4c938d22c88a9ddccc8c55a85e0430e9c62b1ac5.tar.gz
ipv6: Make MLD packets to only be processed locally
Before commit daad151263cf ("ipv6: Make ipv6_is_mld() inline and use it from ip6_mc_input().") MLD packets were only processed locally. After the change, a copy of MLD packet goes through ip6_mr_input, causing MRT6MSG_NOCACHE message to be generated to user space. Make MLD packet only processed locally. Fixes: daad151263cf ("ipv6: Make ipv6_is_mld() inline and use it from ip6_mc_input().") Signed-off-by: Hermin Anggawijaya <hermin.anggawijaya@alliedtelesis.co.nz> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_input.c')
-rw-r--r--net/ipv6/ip6_input.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index f2e464eba5ef..57990c929cd8 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -331,10 +331,10 @@ int ip6_mc_input(struct sk_buff *skb)
if (offset < 0)
goto out;
- if (!ipv6_is_mld(skb, nexthdr, offset))
- goto out;
+ if (ipv6_is_mld(skb, nexthdr, offset))
+ deliver = true;
- deliver = true;
+ goto out;
}
/* unknown RA - process it normally */
}