tree a00832901f84e7d6eeb773061e8d0746da323bd8
parent 659e0bcaebc4ca36e64eac6e9f39c1904b17472c
parent a09a4c8dd1ec7f830e1fb9e59eb72bddc965d168
author David S. Miller <davem@davemloft.net> 1458506020 -0400
committer David S. Miller <davem@davemloft.net> 1458506020 -0400

Merge branch 'tunnel-fixes'

Jesse Gross says:

====================
Tunneling fixes

This series fixes a problem that was reported where encapsulated packets
do not have their encapsulation offload markers stripped off when being
decapsulated. This causes a significant performance drop if the packets
are later retransmitted.

Fixing this revealed two other bugs which are also addressed as prerequisites:
 * GRO can aggregate packets for multiple layers of encapsulation which the
   stack cannot properly handle.
 * IPIP packets which are combined by GRO are not marked properly with their
   GSO type.

Note that this is based off the net-next tree as the current target for
bug fixes.

v2: No code changes, just additional information in commit messages and
    a new cover letter.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>