diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-31 08:27:18 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-31 08:27:52 +0300 |
| commit | 7ba9d103466e6c8568fae6db1e79bbfcc8f4a680 (patch) | |
| tree | bfa1f1a6174f542d98eba376a54cdd8f568f4f09 /drivers/soc | |
| parent | 41852497a9205964b958a245a9526040b980926f (diff) | |
| parent | 607fca9acfb62a9caf7bd46771ecbc4d8fec7388 (diff) | |
| download | linux-7ba9d103466e6c8568fae6db1e79bbfcc8f4a680.tar.xz | |
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 <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/soc')
0 files changed, 0 insertions, 0 deletions