From: "Linus Lüssing" <linus.luessing@c0d3.blue>
To: b.a.t.m.a.n@lists.open-mesh.org, netdev@vger.kernel.org,
bridge@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Stephen Hemminger <stephen@networkplumber.org>,
Herbert Xu <herbert@gondor.apana.org.au>,
Tom Herbert <tom@herbertland.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [B.A.T.M.A.N.] [PATCHv3 net-next 1/2] bridge: multicast: call skb_checksum_{simple_, }validate
Date: Sat, 2 May 2015 14:01:06 +0200 [thread overview]
Message-ID: <1430568067-6912-2-git-send-email-linus.luessing@c0d3.blue> (raw)
In-Reply-To: <1430568067-6912-1-git-send-email-linus.luessing@c0d3.blue>
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
next prev parent reply other threads:[~2015-05-02 12:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-02 12:01 [B.A.T.M.A.N.] [PATCHv3 net-next 0/2] Exporting IGMP/MLD checking from bridge code Linus Lüssing
2015-05-02 12:01 ` Linus Lüssing [this message]
2015-05-04 16:10 ` [B.A.T.M.A.N.] [PATCHv3 net-next 1/2] bridge: multicast: call skb_checksum_{simple_, }validate Stephen Hemminger
2015-05-02 12:01 ` [B.A.T.M.A.N.] [PATCHv3 net-next 2/2] net: Export IGMP/MLD message validation code Linus Lüssing
2015-05-04 18:49 ` [B.A.T.M.A.N.] [PATCHv3 net-next 0/2] Exporting IGMP/MLD checking from bridge code David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1430568067-6912-2-git-send-email-linus.luessing@c0d3.blue \
--to=linus.luessing@c0d3.blue \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
--cc=tom@herbertland.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).