bridge.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
* [Bridge] [PATCH 1/2] bridge: multicast: call skb_checksum_{simple_, }validate
@ 2015-04-10 17:46 Linus Lüssing
  2015-04-10 17:46 ` [Bridge] [PATCH 2/2] net: Export IGMP/MLD message validation code Linus Lüssing
  2015-04-12 13:38 ` [Bridge] [B.A.T.M.A.N.] [PATCH 1/2] bridge: multicast: call skb_checksum_{simple_, }validate Rudresh NB
  0 siblings, 2 replies; 6+ messages in thread
From: Linus Lüssing @ 2015-04-10 17:46 UTC (permalink / raw)
  To: b.a.t.m.a.n, netdev, bridge, linux-kernel, Hideaki YOSHIFUJI,
	Stephen Hemminger, Herbert Xu, Tom Herbert, David S. Miller
  Cc: Linus Lüssing

Let's use these new, neat helpers.

Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
---
 net/bridge/br_multicast.c |   28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 4b6722f..b52f4cb 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1610,16 +1610,8 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,
 	if (!pskb_may_pull(skb2, sizeof(*ih)))
 		goto out;
 
-	switch (skb2->ip_summed) {
-	case CHECKSUM_COMPLETE:
-		if (!csum_fold(skb2->csum))
-			break;
-		/* fall through */
-	case CHECKSUM_NONE:
-		skb2->csum = 0;
-		if (skb_checksum_complete(skb2))
-			goto out;
-	}
+	if (skb_checksum_simple_validate(skb2))
+		goto out;
 
 	err = 0;
 
@@ -1737,20 +1729,8 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
 
 	ip6h = ipv6_hdr(skb2);
 
-	switch (skb2->ip_summed) {
-	case CHECKSUM_COMPLETE:
-		if (!csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr, skb2->len,
-					IPPROTO_ICMPV6, skb2->csum))
-			break;
-		/*FALLTHROUGH*/
-	case CHECKSUM_NONE:
-		skb2->csum = ~csum_unfold(csum_ipv6_magic(&ip6h->saddr,
-							&ip6h->daddr,
-							skb2->len,
-							IPPROTO_ICMPV6, 0));
-		if (__skb_checksum_complete(skb2))
-			goto out;
-	}
+	if (skb_checksum_validate(skb2, IPPROTO_ICMPV6, ip6_compute_pseudo))
+		goto out;
 
 	err = 0;
 
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-04-13 17:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-10 17:46 [Bridge] [PATCH 1/2] bridge: multicast: call skb_checksum_{simple_, }validate Linus Lüssing
2015-04-10 17:46 ` [Bridge] [PATCH 2/2] net: Export IGMP/MLD message validation code Linus Lüssing
2015-04-11  1:46   ` [Bridge] [B.A.T.M.A.N.] " Linus Lüssing
2015-04-13  7:18     ` [Bridge] " YOSHIFUJI Hideaki/吉藤英明
2015-04-13 17:32   ` David Miller
2015-04-12 13:38 ` [Bridge] [B.A.T.M.A.N.] [PATCH 1/2] bridge: multicast: call skb_checksum_{simple_, }validate Rudresh NB

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).