diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-07 17:25:25 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-08 09:43:05 +0100
commit6ae2b0084f9ed794c7dfb4d31db0391bd6a8082c (patch)
parentb3a65e4a6cedf0041165e76c708eacc77d8c3c5e (diff)
Fix "tunnels: Don't apply GRO to multiple layers of encapsulation."
Commit dd4fff23f0f4c7c5414f50c091c78a7e423f85da which is commit fac8e0f579695a3ecbc4d3cac369139d7f819971 upstream, seems to have included the sit_gro_receive function, yet it never is used, causing an obvious warning message. Hook it up to the correct sit_offload structure. Note, for 3.16, the backport of fac8e0f579695a3ecbc4d3cac369139d7f819971 does not include this function, nor the ipip case. I'm guessing that this is not correct for 3.18, as one of the functions was included, but could be totally wrong. Cc: Jesse Gross <jesse@kernel.org> Cc: David S. Miller <davem@davemloft.net> Cc: Ben Hutchings <ben@decadent.org.uk> Cc: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
index f291813c7c0c..219b9d24b3b3 100644
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
@@ -305,7 +305,7 @@ static struct packet_offload ipv6_packet_offload __read_mostly = {
static const struct net_offload sit_offload = {
.callbacks = {
.gso_segment = ipv6_gso_segment,
- .gro_receive = ipv6_gro_receive,
+ .gro_receive = sit_gro_receive,
.gro_complete = ipv6_gro_complete,