net: erspan: fix erspan config overwrite
authorWilliam Tu <u9012063@gmail.com>
Mon, 5 Feb 2018 21:35:35 +0000 (13:35 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 6 Feb 2018 16:32:49 +0000 (11:32 -0500)
commit39f57f6799cdd437277122d4cd1c470c08f527c0
tree8d1d6ff983ddf133d915be19cf6e54c046b8849e
parent3df1928302950dfa728ab2eade28eea0da291567
net: erspan: fix erspan config overwrite

When an erspan tunnel device receives an erpsan packet with different
tunnel metadata (ex: version, index, hwid, direction), existing code
overwrites the tunnel device's erspan configuration with the received
packet's metadata.  The patch fixes it.

Fixes: 1a66a836da63 ("gre: add collect_md mode to ERSPAN tunnel")
Fixes: f551c91de262 ("net: erspan: introduce erspan v2 for ip_gre")
Fixes: ef7baf5e083c ("ip6_gre: add ip6 erspan collect_md mode")
Fixes: 94d7d8f29287 ("ip6_gre: add erspan v2 support")
Signed-off-by: William Tu <u9012063@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_gre.c
net/ipv6/ip6_gre.c