Skip to contentSkip to conversation

tunnels: Don't apply GRO to multiple layers of encapsulation.

DISCUSSION [email protected] 1 participant 1 message Sep 5, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Sasha,
The backport of

fac8e0f579695a3ecbc4d3cac369139d7f819971
tunnels: Don't apply GRO to multiple layers of encapsulation

into 4.1 missed a hunk. The same backport into 3.18 was done correctly. This patch introduces the missing hunk into 4.1. Excepts from some emails:

Quoted 4 lines · Joe Korty

I am not experiencing any bad symptoms. I simply noticed that the patch introduced a new function, sit_gro_receive, without introducing any users, and that same patch in linux-4.4.y does have a user.

Quoted 7 lines · Jesse gross

Thanks for pointing that out. The line you mentioned should indeed be there and seems to have been missed in the backport.

The backport was actually done by Sasha, not by me - would you mind sending a patch to him or working with him to fix it?

Could you review this and run it through your tests and send it along to Greg if appropriate?

Thanks,
Joe

net/ipv6/ip6_offload.c +1 -1
Index: b/net/ipv6/ip6_offload.c
===================================================================
@@ -300,7 +300,7 @@ static struct packet_offload ipv6_packet
 	.type = cpu_to_be16(ETH_P_IPV6),
 	.callbacks = {
 		.gso_segment = ipv6_gso_segment,
-		.gro_receive = ipv6_gro_receive,
+		.gro_receive = sit_gro_receive,
 		.gro_complete = ipv6_gro_complete,
 	},
 };