diff options
author | Jakub Kicinski <kuba@kernel.org> | 2020-10-13 20:02:54 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-13 20:02:54 -0700 |
commit | 1e40d75ef90c5c99d9418637cd7295fa49ecb5fb (patch) | |
tree | d3878281eb6abeabc2d5993985fb688eef3579e5 /net/ipv4/udp_tunnel_core.c | |
parent | fdafed459998e2be0e877e6189b24cb7a0183224 (diff) | |
parent | 0d9826bc18ce356e8909919ad681ad65d0a6061e (diff) | |
download | linux-1e40d75ef90c5c99d9418637cd7295fa49ecb5fb.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Extend nf_queue selftest to cover re-queueing, non-gso mode and
delayed queueing, from Florian Westphal.
2) Clear skb->tstamp in IPVS forwarding path, from Julian Anastasov.
3) Provide netlink extended error reporting for EEXIST case.
4) Missing VLAN offload tag and proto in log target.
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/udp_tunnel_core.c')
0 files changed, 0 insertions, 0 deletions