From: David S. Miller <davem@davemloft.net>
Date: Fri, 22 Feb 2019 00:02:10 +0000 (-0800)
Subject: Merge branch 'report-erspan-version-field-just-for-erspan-tunnels'
X-Git-Tag: v5.0-rc8~2^2~25
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=31088cb5ca6e4b8fda36f8686d15f037bd039f2a;p=users%2Fdwmw2%2Flinux.git

Merge branch 'report-erspan-version-field-just-for-erspan-tunnels'

Lorenzo Bianconi says:

====================
report erspan version field just for erspan tunnels

Do not report erspan_version to userpsace for non erspan tunnels.
Report IFLA_GRE_ERSPAN_INDEX only for erspan version 1 in
ip6gre_fill_info
====================

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

31088cb5ca6e4b8fda36f8686d15f037bd039f2a