diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-01-21 09:25:58 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-21 09:25:58 +0100 |
| commit | 9c5ed2f831c603439c699f8cd69e9998de472526 (patch) | |
| tree | 6865c59045ca2c0ce71277b615d102251de15677 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | hsr: Fix a compilation error (diff) | |
| parent | xfrm: support output_mark for offload ESP packets (diff) | |
| download | wireguard-linux-9c5ed2f831c603439c699f8cd69e9998de472526.tar.xz wireguard-linux-9c5ed2f831c603439c699f8cd69e9998de472526.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2020-01-21
1) Fix packet tx through bpf_redirect() for xfrm and vti
interfaces. From Nicolas Dichtel.
2) Do not confirm neighbor when do pmtu update on a virtual
xfrm interface. From Xu Wang.
3) Support output_mark for offload ESP packets, this was
forgotten when the output_mark was added initially.
From Ulrich Weber.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions