From: David S. Miller Date: Wed, 31 Aug 2016 05:27:18 +0000 (-0700) Subject: Merge branch 'mpls-fragmentation-and-gso-fixes' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7ba9d103466e6c8568fae6db1e79bbfcc8f4a680;p=linux-beck.git Merge branch 'mpls-fragmentation-and-gso-fixes' David Ahern says: ==================== net: mpls: fragmentation and gso fixes for locally originated traffic This series fixes mtu and fragmentation for tunnels using lwtunnel output redirect, and fixes GSO for MPLS for locally originated traffic reported by Lennert Buytenhek. A follow on series will address fragmentation and GSO for forwarded MPLS traffic. Hardware offload of GSO with MPLS also needs to be addressed. Simon: Can you verify this works with OVS for single and multiple labels? v4 - more updates to mpls_gso_segment per Alex's comments (thanks, Alex) - updates to teaching OVS about marking MPLS labels as the network header v3 - updates to mpls_gso_segment per Alex's comments - dropped skb->encapsulation = 1 from mpls_xmit per Alex's comment v2 - consistent use of network_header in skb to fix GSO for MPLS - update MPLS code in OVS to network_header and inner_network_header ==================== Tested-by: Simon Horman Signed-off-by: David S. Miller --- 7ba9d103466e6c8568fae6db1e79bbfcc8f4a680