diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-05-20 01:06:33 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-05-20 06:53:08 +0200 |
| commit | 805cb5aadc2a88c453cfe620b28e12ff2fac27a6 (patch) | |
| tree | 4092548cf74072313e9680a6f1fcfe0b2fec834b /drivers/net/can/dev/dev.c | |
| parent | eth: mtk_ppe: fix up after merge (diff) | |
| parent | netfilter: ctnetlink: fix up for "netfilter: conntrack: remove unconfirmed list" (diff) | |
| download | linux-805cb5aadc2a88c453cfe620b28e12ff2fac27a6.tar.xz linux-805cb5aadc2a88c453cfe620b28e12ff2fac27a6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following patchset contains Netfilter updates for net-next, misc
updates and fallout fixes from recent Florian's code rewritting (from
last pull request):
1) Use new flowi4_l3mdev field in ip_route_me_harder(), from Martin Willi.
2) Avoid unnecessary GC with a timestamp in conncount, from William Tu
and Yifeng Sun.
3) Remove TCP conntrack debugging, from Florian Westphal.
4) Fix compilation warning in ctnetlink, from Florian.
* git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next:
netfilter: ctnetlink: fix up for "netfilter: conntrack: remove unconfirmed list"
netfilter: conntrack: remove pr_debug callsites from tcp tracker
netfilter: nf_conncount: reduce unnecessary GC
netfilter: Use l3mdev flow key when re-routing mangled packets
====================
Link: https://lore.kernel.org/r/20220519220206.722153-1-pablo@netfilter.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/can/dev/dev.c')
0 files changed, 0 insertions, 0 deletions