]> git.baikalelectronics.ru Git - kernel.git/commit
net: erspan: fix metadata extraction
authorWilliam Tu <u9012063@gmail.com>
Mon, 5 Feb 2018 21:35:34 +0000 (13:35 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 6 Feb 2018 16:32:48 +0000 (11:32 -0500)
commit66a56426ad57ee81ea817c819aa6384a800eee7d
tree325f571ad901f437ba33ace9f820be396444c81b
parentd222a3f8ab362ff1426e51e8fd4931e6ca2682ba
net: erspan: fix metadata extraction

Commit 2133ebfc987f ("net: erspan: create erspan metadata uapi header")
moves the erspan 'version' in front of the 'struct erspan_md2' for
later extensibility reason.  This breaks the existing erspan metadata
extraction code because the erspan_md2 then has a 4-byte offset
to between the erspan_metadata and erspan_base_hdr.  This patch
fixes it.

Fixes: 08c0b234acee ("gre: add collect_md mode to ERSPAN tunnel")
Fixes: 1fad55ed3324 ("ip6_gre: add ip6 erspan collect_md mode")
Fixes: df16bd187e9d ("net: erspan: refactor existing erspan code")
Signed-off-by: William Tu <u9012063@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/erspan.h
net/ipv4/ip_gre.c
net/ipv6/ip6_gre.c