Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4749c09c authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

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: default avatarTom Herbert <therbert@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0f4f4ffa

include/linux/netdev_features.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ enum { 
	NETIF_F_TSO6_BIT,		/* ... TCPv6 segmentation */

	NETIF_F_FSO_BIT,		/* ... FCoE segmentation */

	NETIF_F_GSO_GRE_BIT,		/* ... GRE with TSO */

	NETIF_F_GSO_GRE_CSUM_BIT,	/* ... GRE with csum with TSO */

	NETIF_F_GSO_IPIP_BIT,		/* ... IPIP tunnel with TSO */

	NETIF_F_GSO_SIT_BIT,		/* ... SIT tunnel with TSO */

	NETIF_F_GSO_UDP_TUNNEL_BIT,	/* ... UDP TUNNEL with TSO */
@@ -112,6 +113,7 @@ enum { 
#define NETIF_F_RXFCS		__NETIF_F(RXFCS)

#define NETIF_F_RXALL		__NETIF_F(RXALL)

#define NETIF_F_GSO_GRE		__NETIF_F(GSO_GRE)

#define NETIF_F_GSO_GRE_CSUM	__NETIF_F(GSO_GRE_CSUM)

#define NETIF_F_GSO_IPIP	__NETIF_F(GSO_IPIP)

#define NETIF_F_GSO_SIT		__NETIF_F(GSO_SIT)

#define NETIF_F_GSO_UDP_TUNNEL	__NETIF_F(GSO_UDP_TUNNEL)

include/linux/skbuff.h

+2 −0
Original line number Diff line number Diff line
@@ -347,6 +347,8 @@ enum { 
	SKB_GSO_MPLS = 1 << 10,



	SKB_GSO_UDP_TUNNEL_CSUM = 1 << 11,



	SKB_GSO_GRE_CSUM = 1 << 12,

};



#if BITS_PER_LONG > 32

include/net/gre.h

+3 −2
Original line number Diff line number Diff line
@@ -37,9 +37,10 @@ void gre_build_header(struct sk_buff *skb, const struct tnl_ptk_info *tpi, 
		      int hdr_len);



static inline struct sk_buff *gre_handle_offloads(struct sk_buff *skb,

						  bool gre_csum)

						  bool csum)

{

	return iptunnel_handle_offloads(skb, gre_csum, SKB_GSO_GRE);

	return iptunnel_handle_offloads(skb, csum,

					csum ? SKB_GSO_GRE_CSUM : SKB_GSO_GRE);

}

net/ipv4/af_inet.c

+1 −0
Original line number Diff line number Diff line
@@ -1254,6 +1254,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb, 
		       SKB_GSO_DODGY |

		       SKB_GSO_TCP_ECN |

		       SKB_GSO_GRE |

		       SKB_GSO_GRE_CSUM |

		       SKB_GSO_IPIP |

		       SKB_GSO_SIT |

		       SKB_GSO_TCPV6 |

net/ipv4/gre_demux.c

+2 −1
Original line number Diff line number Diff line
@@ -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));