From: David S. Miller Date: Tue, 28 May 2013 05:51:06 +0000 (-0700) Subject: Merge branch 'mpls_gso' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=51047840e60287fb4f34bc768cc65f4bfc9098f4;p=linux-beck.git Merge branch 'mpls_gso' Simon Horman says: ==================== In the case where a non-MPLS packet is received and an MPLS stack is added it may well be the case that the original skb is GSO but the NIC used for transmit does not support GSO of MPLS packets. The aim of this short series is to provide GSO in software for MPLS packets whose skbs are GSO. Change since v4: Update first patch of the series to use 16 bits for all *_headers rather than just inner_*_headers Simon Horman (2): net: Use 16bits for *_headers fields of struct skbuff MPLS: Add limited GSO support ==================== Signed-off-by: David S. Miller --- 51047840e60287fb4f34bc768cc65f4bfc9098f4