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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A31BEB64DD for ; Thu, 13 Jul 2023 11:50:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234363AbjGMLun (ORCPT ); Thu, 13 Jul 2023 07:50:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233799AbjGMLum (ORCPT ); Thu, 13 Jul 2023 07:50:42 -0400 Received: from orbyte.nwl.cc (orbyte.nwl.cc [IPv6:2001:41d0:e:133a::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58B0B119 for ; Thu, 13 Jul 2023 04:50:41 -0700 (PDT) Received: from n0-1 by orbyte.nwl.cc with local (Exim 4.94.2) (envelope-from ) id 1qJuqF-0007qI-71; Thu, 13 Jul 2023 13:50:39 +0200 Date: Thu, 13 Jul 2023 13:50:39 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org, fw@strlen.de, igor@gooddata.com Subject: Re: [PATCH iptables] nft-bridge: pass context structure to ops->add() to improve anonymous set support Message-ID: Mail-Followup-To: Phil Sutter , Pablo Neira Ayuso , netfilter-devel@vger.kernel.org, fw@strlen.de, igor@gooddata.com References: <20230712095912.140792-1-pablo@netfilter.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230712095912.140792-1-pablo@netfilter.org> Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Wed, Jul 12, 2023 at 11:59:12AM +0200, Pablo Neira Ayuso wrote: [...] > diff --git a/iptables/nft.c b/iptables/nft.c > index 1cb104e75ccc..59e3fa7079c4 100644 > --- a/iptables/nft.c > +++ b/iptables/nft.c > @@ -1154,7 +1154,8 @@ gen_lookup(uint32_t sreg, const char *set_name, uint32_t set_id, uint32_t flags) > #define NFT_DATATYPE_ETHERADDR 9 > > static int __add_nft_among(struct nft_handle *h, const char *table, > - struct nftnl_rule *r, struct nft_among_pair *pairs, > + struct nft_rule_ctx *ctx, struct nftnl_rule *r, > + struct nft_among_pair *pairs, > int cnt, bool dst, bool inv, bool ip) > { > uint32_t set_id, type = NFT_DATATYPE_ETHERADDR, len = ETH_ALEN; Is there something missing here? Neither add_nft_among() nor __add_nft_among() use the new parameter. Or is this left over from a previous version of the fix? Cheers, Phil