Re: [iptables PATCH] ebtables: Fix among match

[Florian Westphal <fw@strlen.de>]

Phil Sutter <phil@nwl.cc> wrote:
> Fixed commit broke among match in two ways:
> 
> 1) The two lookup sizes are 12 and 6, not 12 and 4 - among supports
>    either ether+IP or ether only, not IP only.
> 
> 2) Adding two to sreg_count to get the second register is too simple: It
>    works only for four byte regs, not the 16 byte ones. The first
>    register is always a 16 byte one, though.
> 
> Fixing (1) is trivial, fix (2) by introduction of nft_get_next_reg()
> doing the right thing. For consistency, use it for among match creation,
> too.

LGTM, thanks.

Could you add a followup patch that cleans this up:

> diff --git a/iptables/nft-bridge.c b/iptables/nft-bridge.c
> index 659c5b58ba633..596dfdf8991f1 100644
> --- a/iptables/nft-bridge.c
> +++ b/iptables/nft-bridge.c
> @@ -349,7 +349,7 @@ static int lookup_analyze_payloads(struct nft_xt_ctx *ctx,
>  			return -1;
>  		}
>  
> -		sreg_count += 2;
> +		sreg_count = nft_get_next_reg(sreg_count, ETH_ALEN);


.. and renames sreg_count to 'enum nft_registers sreg' or similar?