|
@@ -1520,16 +1520,23 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
|
|
|
err = pskb_trim_rcsum(skb2, len);
|
|
|
if (err)
|
|
|
goto out;
|
|
|
+ err = -EINVAL;
|
|
|
}
|
|
|
|
|
|
+ ip6h = ipv6_hdr(skb2);
|
|
|
+
|
|
|
switch (skb2->ip_summed) {
|
|
|
case CHECKSUM_COMPLETE:
|
|
|
- if (!csum_fold(skb2->csum))
|
|
|
+ if (!csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr, skb2->len,
|
|
|
+ IPPROTO_ICMPV6, skb2->csum))
|
|
|
break;
|
|
|
/*FALLTHROUGH*/
|
|
|
case CHECKSUM_NONE:
|
|
|
- skb2->csum = 0;
|
|
|
- if (skb_checksum_complete(skb2))
|
|
|
+ skb2->csum = ~csum_unfold(csum_ipv6_magic(&ip6h->saddr,
|
|
|
+ &ip6h->daddr,
|
|
|
+ skb2->len,
|
|
|
+ IPPROTO_ICMPV6, 0));
|
|
|
+ if (__skb_checksum_complete(skb2))
|
|
|
goto out;
|
|
|
}
|
|
|
|