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

Commit 06f62292 authored by Edward Cree's avatar Edward Cree Committed by David S. Miller
Browse files

fou: enable LCO in FOU and GUE 



Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b5708501

net/ipv4/fou.c

+6 −8
Original line number Diff line number Diff line
@@ -774,7 +774,6 @@ static void fou_build_udp(struct sk_buff *skb, struct ip_tunnel_encap *e, 
	uh->dest = e->dport;

	uh->source = sport;

	uh->len = htons(skb->len);

	uh->check = 0;

	udp_set_csum(!(e->flags & TUNNEL_ENCAP_FLAG_CSUM), skb,

		     fl4->saddr, fl4->daddr, skb->len);
@@ -784,11 +783,11 @@ static void fou_build_udp(struct sk_buff *skb, struct ip_tunnel_encap *e, 
int fou_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e,

		     u8 *protocol, struct flowi4 *fl4)

{

	bool csum = !!(e->flags & TUNNEL_ENCAP_FLAG_CSUM);

	int type = csum ? SKB_GSO_UDP_TUNNEL_CSUM : SKB_GSO_UDP_TUNNEL;

	int type = e->flags & TUNNEL_ENCAP_FLAG_CSUM ? SKB_GSO_UDP_TUNNEL_CSUM :

						       SKB_GSO_UDP_TUNNEL;

	__be16 sport;



	skb = iptunnel_handle_offloads(skb, csum, type);

	skb = iptunnel_handle_offloads(skb, false, type);



	if (IS_ERR(skb))

		return PTR_ERR(skb);
@@ -804,8 +803,8 @@ EXPORT_SYMBOL(fou_build_header); 
int gue_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e,

		     u8 *protocol, struct flowi4 *fl4)

{

	bool csum = !!(e->flags & TUNNEL_ENCAP_FLAG_CSUM);

	int type = csum ? SKB_GSO_UDP_TUNNEL_CSUM : SKB_GSO_UDP_TUNNEL;

	int type = e->flags & TUNNEL_ENCAP_FLAG_CSUM ? SKB_GSO_UDP_TUNNEL_CSUM :

						       SKB_GSO_UDP_TUNNEL;

	struct guehdr *guehdr;

	size_t hdrlen, optlen = 0;

	__be16 sport;
@@ -814,7 +813,6 @@ int gue_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e, 


	if ((e->flags & TUNNEL_ENCAP_FLAG_REMCSUM) &&

	    skb->ip_summed == CHECKSUM_PARTIAL) {

		csum = false;

		optlen += GUE_PLEN_REMCSUM;

		type |= SKB_GSO_TUNNEL_REMCSUM;

		need_priv = true;
@@ -822,7 +820,7 @@ int gue_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e, 


	optlen += need_priv ? GUE_LEN_PRIV : 0;



	skb = iptunnel_handle_offloads(skb, csum, type);

	skb = iptunnel_handle_offloads(skb, false, type);



	if (IS_ERR(skb))

		return PTR_ERR(skb);