summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/netronome/nfp/nfpcore
diff options
context:
space:
mode:
authorDavid S. Miller2018-02-06 17:32:49 +0100
committerDavid S. Miller2018-02-06 17:32:49 +0100
commit67ae44e1a6238531a2f324a30b6524d228df3131 (patch)
tree9f6a56f4d4d7226b735237e1e99510d2ac194b75 /drivers/net/ethernet/netronome/nfp/nfpcore
parentcls_u32: fix use after free in u32_destroy_key() (diff)
parentsample/bpf: fix erspan metadata (diff)
downloadkernel-qcow2-linux-67ae44e1a6238531a2f324a30b6524d228df3131.tar.gz
kernel-qcow2-linux-67ae44e1a6238531a2f324a30b6524d228df3131.tar.xz
kernel-qcow2-linux-67ae44e1a6238531a2f324a30b6524d228df3131.zip
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 <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/nfpcore')
0 files changed, 0 insertions, 0 deletions