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

Commit c3caf119 authored by Jerry Chu's avatar Jerry Chu Committed by David S. Miller
Browse files

net-gre-gro: Fix a bug that breaks the forwarding path 



Fixed a bug that was introduced by my GRE-GRO patch
(bf5a755f net-gre-gro: Add GRE
support to the GRO stack) that breaks the forwarding path
because various GSO related fields were not set. The bug will
cause on the egress path either the GSO code to fail, or a
GRE-TSO capable (NETIF_F_GSO_GRE) NICs to choke. The following
fix has been tested for both cases.

Signed-off-by: default avatarH.K. Jerry Chu <hkchu@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b6603fe5

net/core/dev.c

+2 −0
Original line number Diff line number Diff line
@@ -4096,6 +4096,8 @@ static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb) 
	skb->vlan_tci = 0;

	skb->dev = napi->dev;

	skb->skb_iif = 0;

	skb->encapsulation = 0;

	skb_shinfo(skb)->gso_type = 0;

	skb->truesize = SKB_TRUESIZE(skb_end_offset(skb));



	napi->skb = skb;

net/ipv4/af_inet.c

+3 −0
Original line number Diff line number Diff line
@@ -1429,6 +1429,9 @@ static int inet_gro_complete(struct sk_buff *skb, int nhoff) 
	int proto = iph->protocol;

	int err = -ENOSYS;



	if (skb->encapsulation)

		skb_set_inner_network_header(skb, nhoff);



	csum_replace2(&iph->check, iph->tot_len, newlen);

	iph->tot_len = newlen;

net/ipv4/gre_offload.c

+3 −0
Original line number Diff line number Diff line
@@ -263,6 +263,9 @@ static int gre_gro_complete(struct sk_buff *skb, int nhoff) 
	int err = -ENOENT;

	__be16 type;



	skb->encapsulation = 1;

	skb_shinfo(skb)->gso_type = SKB_GSO_GRE;



	type = greh->protocol;

	if (greh->flags & GRE_KEY)

		grehlen += GRE_HEADER_SECTION;

net/ipv4/tcp_offload.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static int tcp4_gro_complete(struct sk_buff *skb, int thoff) 


	th->check = ~tcp_v4_check(skb->len - thoff, iph->saddr,

				  iph->daddr, 0);

	skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;

	skb_shinfo(skb)->gso_type |= SKB_GSO_TCPV4;



	return tcp_gro_complete(skb);

}

net/ipv6/tcpv6_offload.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int tcp6_gro_complete(struct sk_buff *skb, int thoff) 


	th->check = ~tcp_v6_check(skb->len - thoff, &iph->saddr,

				  &iph->daddr, 0);

	skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;

	skb_shinfo(skb)->gso_type |= SKB_GSO_TCPV6;



	return tcp_gro_complete(skb);

}