Skip to content

netfilter: ecache: simplify event registration

Florian Westphal netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest5 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5netfilter: ecache: remove one indent levelinclude/net/netfilter/nf_conntrack_ecache.h net/netfilter/nf_conntrack_ecache.c net/netfilter/nf_conntrack_netlink.c+36 -320 replies
2/5netfilter: ecache: remove another indent levelnet/netfilter/nf_conntrack_ecache.c+18 -160 replies
3/5netfilter: ecache: add common helper for nf_conntrack_eventmask_reportnet/netfilter/nf_conntrack_ecache.c+56 -680 replies
4/5netfilter: ecache: prepare for event notifier mergeinclude/net/netfilter/nf_conntrack_ecache.h net/netfilter/nf_conntrack_ecache.c net/netfilter/nf_conntrack_netlink.c+17 -420 replies
5/5netfilter: ecache: remove nf_exp_event_notifier structureinclude/net/netfilter/nf_conntrack_ecache.h include/net/netns/conntrack.h net/netfilter/nf_conntrack_ecache.c +1 more+13 -840 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH nf-next 0/5] netfilter: ecache: simplify event registration

This patchset simplifies event registration handling.

Event and expectation handler registration is merged into one. This reduces boilerplate code during netns register/unregister.

Also, there is only one implementation of the event handler (ctnetlink), so it makes no sense to return -EBUSY if another handler is registered already -- it cannot happen.

This also allows to remove the 'nf_exp_event_notifier' pointer from struct net.

Florian Westphal (5):
netfilter: ecache: remove one indent level
netfilter: ecache: remove another indent level
netfilter: ecache: add common helper for nf_conntrack_eventmask_report
netfilter: ecache: prepare for event notifier merge
netfilter: ecache: remove nf_exp_event_notifier structure

 include/net/netfilter/nf_conntrack_ecache.h |  32 +--
 include/net/netns/conntrack.h               |   1 -
 net/netfilter/nf_conntrack_ecache.c         | 211 +++++++-------------
 net/netfilter/nf_conntrack_netlink.c        |  50 +----
 4 files changed, 96 insertions(+), 198 deletions(-)
Signature · 1 line
2.31.1