diff options
| author | David S. Miller <davem@davemloft.net> | 2018-02-06 11:32:49 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-06 11:32:49 -0500 |
| commit | 67ae44e1a6238531a2f324a30b6524d228df3131 (patch) | |
| tree | 9f6a56f4d4d7226b735237e1e99510d2ac194b75 /fs/devpts | |
| parent | d7cdee5ea8d28ae1b6922deb0c1badaa3aa0ef8c (diff) | |
| parent | 9c33ca4317c81d9a5d030bbc60aeb2d16edf172b (diff) | |
| download | linux-67ae44e1a6238531a2f324a30b6524d228df3131.tar.bz2 | |
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 'fs/devpts')
0 files changed, 0 insertions, 0 deletions