diff options
| author | Tom Herbert <therbert@google.com> | 2014-05-08 01:51:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-09 05:47:50 +0200 |
| commit | b1036c6a470ccf5f18490a7ce4c99422d3bf77c4 (patch) | |
| tree | 05ecb3e302e157bf34ca555e3e990696b7af92ca /net/ipv4/gre_demux.c | |
| parent | mellanox: Logging message cleanups (diff) | |
| download | linux-b1036c6a470ccf5f18490a7ce4c99422d3bf77c4.tar.xz linux-b1036c6a470ccf5f18490a7ce4c99422d3bf77c4.zip | |
gre: Call skb_checksum_simple_validate
Use skb_checksum_simple_validate to verify checksum.
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/gre_demux.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c index 250be7421ab3..fbfd829f4049 100644 --- a/net/ipv4/gre_demux.c +++ b/net/ipv4/gre_demux.c @@ -93,28 +93,6 @@ void gre_build_header(struct sk_buff *skb, const struct tnl_ptk_info *tpi, } EXPORT_SYMBOL_GPL(gre_build_header); -static __sum16 check_checksum(struct sk_buff *skb) -{ - __sum16 csum = 0; - - switch (skb->ip_summed) { - case CHECKSUM_COMPLETE: - csum = csum_fold(skb->csum); - - if (!csum) - break; - /* Fall through. */ - - case CHECKSUM_NONE: - skb->csum = 0; - csum = __skb_checksum_complete(skb); - skb->ip_summed = CHECKSUM_COMPLETE; - break; - } - - return csum; -} - static int parse_gre_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, bool *csum_err) { @@ -141,7 +119,7 @@ static int parse_gre_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, options = (__be32 *)(greh + 1); if (greh->flags & GRE_CSUM) { - if (check_checksum(skb)) { + if (skb_checksum_simple_validate(skb)) { *csum_err = true; return -EINVAL; } |