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

Browse source

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>

...

This commit is contained in:

David S. Miller 2019-02-21 16:02:10 -08:00

parent 9e8db59132 103d0244d2

commit 31088cb5ca

2 changed files with 35 additions and 34 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

33

net/ipv4/ip_gre.c

View file

36

net/ipv6/ip6_gre.c

View file