diff options
| author | Tom Herbert <therbert@google.com> | 2014-06-04 17:20:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-04 22:46:38 -0700 |
| commit | 4749c09c37030ccdc44aecebe0f71b02a377fc14 (patch) | |
| tree | d8bef1d48e73e2e5492765ae5348f1f0dffbad1c /net/ipv4/gre_demux.c | |
| parent | 0f4f4ffa7b7c3d29d0537a126145c9f8d8ed5dbc (diff) | |
| download | linux-4749c09c37030ccdc44aecebe0f71b02a377fc14.tar.bz2 | |
gre: Call gso_make_checksum
Call gso_make_checksum. This should have the benefit of using a
checksum that may have been previously computed for the packet.
This also adds NETIF_F_GSO_GRE_CSUM to differentiate devices that
offload GRE GSO with and without the GRE checksum offloaed.
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/gre_demux.c')
| -rw-r--r-- | net/ipv4/gre_demux.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c index fbfd829f4049..4e9619bca732 100644 --- a/net/ipv4/gre_demux.c +++ b/net/ipv4/gre_demux.c @@ -84,7 +84,8 @@ void gre_build_header(struct sk_buff *skb, const struct tnl_ptk_info *tpi, ptr--; } if (tpi->flags&TUNNEL_CSUM && - !(skb_shinfo(skb)->gso_type & SKB_GSO_GRE)) { + !(skb_shinfo(skb)->gso_type & + (SKB_GSO_GRE|SKB_GSO_GRE_CSUM))) { *ptr = 0; *(__sum16 *)ptr = csum_fold(skb_checksum(skb, 0, skb->len, 0)); |