[PATCH net-next 1/2] ip_gre: allow CSUM capable devices to handle packets
From: <hidden>
Date: 2013-02-18 13:15:26
Subsystem:
networking [general], networking [ipv4/ipv6], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, David Ahern, Ido Schimmel, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2013-02-18 · Re: [PATCH net-next 1/2] ip_gre: allow CSUM capable devices to handle packets · David Miller <davem@davemloft.net>
- 2013-02-18 · [PATCH net-next 1/2] ip_gre: allow CSUM capable devices to handle packets · Dmitry Kravkov <hidden>
From: Dmitry Kravkov <redacted> If device is not able to handle checksumming it will be handled in dev_xmit Signed-off-by: Dmitry Kravkov <redacted> --- net/ipv4/ip_gre.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index a56f118..cdc31ac 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c@@ -745,12 +745,9 @@ static struct sk_buff *handle_offloads(struct sk_buff *skb) goto error; skb_shinfo(skb)->gso_type |= SKB_GSO_GRE; return skb; - } else if (skb->ip_summed == CHECKSUM_PARTIAL) { - err = skb_checksum_help(skb); - if (unlikely(err)) - goto error; } - skb->ip_summed = CHECKSUM_NONE; + if (skb->ip_summed != CHECKSUM_PARTIAL) + skb->ip_summed = CHECKSUM_NONE; return skb;
--
1.7.7.2