From: David S. Miller Date: Tue, 6 Feb 2018 16:32:49 +0000 (-0500) Subject: Merge branch 'net-erspan-fixes' X-Git-Tag: v4.16-rc1~53^2~3 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=67ae44e1a6238531a2f324a30b6524d228df3131;p=linux.git Merge branch 'net-erspan-fixes' William Tu says: ==================== net: erspan fixes The first patch fixes erspan metadata extraction issue from packet header due to commit d350a823020e ("net: erspan: create erspan metadata uapi header"). The commit moves the erspan 'version' in 'struct erspan_metadata' in front of 'struct erspan_md2' for later extensibility, but breaks the existing metadata extraction code due to extra 4-byte size 'version'. The second patch fixes the case where tunnel device receives an erspan packet with different tunnel metadata (ex: version, index, hwid, direction), existing code overwrites the tunnel device's erspan configuration. The third patch fixes the bpf tests due to the above patches. ==================== Signed-off-by: David S. Miller --- 67ae44e1a6238531a2f324a30b6524d228df3131