| Message ID | 1517866536-69908-1-git-send-email-u9012063@gmail.com |
|---|---|
| Headers | show |
| Series | net: erspan fixes | expand |
From: William Tu <u9012063@gmail.com> Date: Mon, 5 Feb 2018 13:35:33 -0800 > 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. Applied, thanks William.
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. William Tu (3): net: erspan: fix metadata extraction net: erspan: fix erspan config overwrite sample/bpf: fix erspan metadata include/net/erspan.h | 26 +++++++++++++------------- net/ipv4/ip_gre.c | 14 ++++---------- net/ipv6/ip6_gre.c | 15 ++++----------- samples/bpf/tcbpf2_kern.c | 41 ++++++++++++++++------------------------- samples/bpf/test_tunnel_bpf.sh | 4 ++-- 5 files changed, 39 insertions(+), 61 deletions(-)