| From foo@baz Tue Feb 7 17:25:25 CET 2017 |
| Date: Tue, 07 Feb 2017 17:25:25 +0100 |
| To: Greg KH <gregkh@linuxfoundation.org> |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Subject: Fix "tunnels: Don't apply GRO to multiple layers of encapsulation." |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| 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> |
| |
| --- |
| net/ipv6/ip6_offload.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/ipv6/ip6_offload.c |
| +++ b/net/ipv6/ip6_offload.c |
| @@ -305,7 +305,7 @@ 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_receive = sit_gro_receive, |
| .gro_complete = ipv6_gro_complete, |
| }, |
| }; |
