projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9e8db59 103d024)
Merge branch 'report-erspan-version-field-just-for-erspan-tunnels'
authorDavid S. Miller <davem@davemloft.net>
Fri, 22 Feb 2019 00:02:10 +0000 (16:02 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 Feb 2019 00:02:10 +0000 (16:02 -0800)
commit31088cb5ca6e4b8fda36f8686d15f037bd039f2a
tree28dada132b0eeb60832ab511fc5278cf0e009590tree | snapshot
parent9e8db5913264d3967b93c765a6a9e464d9c473dbcommit | diff
parent103d0244d29fcaf38f1339d4538919bbbc051490commit | diff
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>
John Crispins staging tree