From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7396C4338F for ; Mon, 16 Aug 2021 15:16:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 90B5E60231 for ; Mon, 16 Aug 2021 15:16:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232181AbhHPPRH (ORCPT ); Mon, 16 Aug 2021 11:17:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229550AbhHPPRG (ORCPT ); Mon, 16 Aug 2021 11:17:06 -0400 Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [IPv6:2a0a:51c0:0:12e:520::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85788C061764 for ; Mon, 16 Aug 2021 08:16:33 -0700 (PDT) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1mFeLn-0007Cv-MX; Mon, 16 Aug 2021 17:16:31 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH nf-next 0/5] netfilter: ecache: simplify event registration Date: Mon, 16 Aug 2021 17:16:21 +0200 Message-Id: <20210816151626.28770-1-fw@strlen.de> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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(-) -- 2.31.1