From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:36165 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753612AbbIZSmV (ORCPT ); Sat, 26 Sep 2015 14:42:21 -0400 Subject: Patch "Revert "sit: Add gro callbacks to sit_offload"" has been added to the 4.1-stable tree To: herbert@gondor.apana.org.au, davem@davemloft.net, gregkh@linuxfoundation.org, linux@stwm.de Cc: , From: Date: Sat, 26 Sep 2015 11:42:20 -0700 Message-ID: <14432929401882@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From foo@baz Sat Sep 26 11:13:07 PDT 2015 From: Herbert Xu Date: Mon, 20 Jul 2015 17:55:38 +0800 Subject: Revert "sit: Add gro callbacks to sit_offload" From: Herbert Xu [ 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. Reported-by: Wolfgang Walter Signed-off-by: Herbert Xu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv6/ip6_offload.c | 2 -- 1 file changed, 2 deletions(-) --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c @@ -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 herbert@gondor.apana.org.au 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