Skip to contentSkip to conversation

Patch "Revert "sit: Add gro callbacks to sit_offload"" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Sep 26, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

Revert "sit: Add gro callbacks to sit_offload"

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
revert-sit-add-gro-callbacks-to-sit_offload.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Sat Sep 26 11:13:07 PDT 2015

From: Herbert Xu <[email protected]>
Date: Mon, 20 Jul 2015 17:55:38 +0800
Subject: Revert "sit: Add gro callbacks to sit_offload"

From: Herbert Xu <[email protected]>

[ Upstream commit fdbf5b097bbd9693a86c0b8bfdd071a9a2117cfc ]

This patch reverts 19424e052fb44da2f00d1a868cbb51f3e9f4bbb5 ("sit:
Add gro callbacks to sit_offload") because it generates packets that cannot be handled even by our own GSO.

---
 net/ipv6/ip6_offload.c |    2 --
 1 file changed, 2 deletions(-)
net/ipv6/ip6_offload.c +0 -2
@@ -292,8 +292,6 @@ static struct packet_offload ipv6_packet
 static const struct net_offload sit_offload = {
 	.callbacks = {
 		.gso_segment	= ipv6_gso_segment,
-		.gro_receive	= ipv6_gro_receive,
-		.gro_complete	= ipv6_gro_complete,
 	},
 };
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/powerpc-uncomment-and-make-enable_kernel_vsx-routine-available.patch queue-4.1/net-fix-skb_set_peeked-use-after-free-bug.patch queue-4.1/ipv6-lock-socket-in-ip6_datagram_connect.patch queue-4.1/net-fix-skb-csum-races-when-peeking.patch queue-4.1/rhashtable-fix-for-resize-events-during-table-walk.patch queue-4.1/net-clone-skb-before-setting-peeked-flag.patch queue-4.1/revert-sit-add-gro-callbacks-to-sit_offload.patch queue-4.1/crypto-vmx-adding-enable_kernel_vsx-to-access-vsx-instructions.patch queue-4.1/netlink-make-sure-ebusy-won-t-escape-from-netlink_insert.patch