From: David S. Miller Date: Sat, 26 Aug 2017 00:10:24 +0000 (-0700) Subject: Merge branch 'ipv6-sr-updates' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cf4828d1666beaef513ce3c8f9e4fe4af1ff4e87;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'ipv6-sr-updates' David Lebrun says: ==================== net: updates for IPv6 Segment Routing v2: seg6_lwt_headroom() is not relevant for lwtunnel_input_redirect() use cases, and L2ENCAP only uses this redirection. Fix incoherence between arbitrary MAC header size support and fixed headroom computation by setting only LWTUNNEL_STATE_INPUT_REDIRECT for L2ENCAP mode. This patch series provides several updates for the SRv6 implementation. The first patch leverages the existing infrastructure to support encapsulation of IPv4 packets. The second patch implements the T.Encaps.L2 SR function, enabling to encapsulate an L2 Ethernet frame within an IPv6+SRH packet. The last three patches update the seg6local lightweight tunnel, and mainly implement four new actions: End.T, End.DX2, End.DX4 and End.DT6. ==================== Signed-off-by: David S. Miller --- cf4828d1666beaef513ce3c8f9e4fe4af1ff4e87