All of lore.kernel.org
 help / color / mirror / Atom feed
From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org, Florian Westphal <fw@strlen.de>,
	Eric Garver <e@erig.me>
Subject: [nf-next PATCH v7 4/6] netfilter: nf_tables: Compare netdev hooks based on stored name
Date: Thu,  9 Jan 2025 18:31:35 +0100	[thread overview]
Message-ID: <20250109173137.17954-5-phil@nwl.cc> (raw)
In-Reply-To: <20250109173137.17954-1-phil@nwl.cc>

The 1:1 relationship between nft_hook and nf_hook_ops is about to break,
so choose the stored ifname to uniquely identify hooks.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 net/netfilter/nf_tables_api.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 900b6c7d5fd6..9a14f0e542f3 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2317,7 +2317,7 @@ static struct nft_hook *nft_hook_list_find(struct list_head *hook_list,
 	struct nft_hook *hook;
 
 	list_for_each_entry(hook, hook_list, list) {
-		if (this->ops.dev == hook->ops.dev)
+		if (!strcmp(hook->ifname, this->ifname))
 			return hook;
 	}
 
-- 
2.47.1


  parent reply	other threads:[~2025-01-09 17:31 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-09 17:31 [nf-next PATCH v7 0/6] Dynamic hook interface binding part 1 Phil Sutter
2025-01-09 17:31 ` [nf-next PATCH v7 1/6] netfilter: nf_tables: Flowtable hook's pf value never varies Phil Sutter
2025-01-09 17:31 ` [nf-next PATCH v7 2/6] netfilter: nf_tables: Store user-defined hook ifname Phil Sutter
2025-01-09 17:31 ` [nf-next PATCH v7 3/6] netfilter: nf_tables: Use stored ifname in netdev hook dumps Phil Sutter
2025-01-09 17:31 ` Phil Sutter [this message]
2025-01-09 17:31 ` [nf-next PATCH v7 5/6] netfilter: nf_tables: Tolerate chains with no remaining hooks Phil Sutter
2025-01-09 17:31 ` [nf-next PATCH v7 6/6] netfilter: nf_tables: Simplify chain netdev notifier Phil Sutter
2025-01-15 16:22 ` [nf-next PATCH v7 0/6] Dynamic hook interface binding part 1 Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250109173137.17954-5-phil@nwl.cc \
    --to=phil@nwl.cc \
    --cc=e@erig.me \
    --cc=fw@strlen.de \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.