From: Phil Sutter <phil@nwl.cc>
Date: Wed, 28 Sep 2022 16:42:02 +0000 (+0200)
Subject: nft-bridge: Drop 'sreg_count' variable
X-Git-Tag: v1.8.9~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ffd3674af160b7e59b480d13a12bf82bea32f04;p=thirdparty%2Fiptables.git

nft-bridge: Drop 'sreg_count' variable

It is not needed, one can just use 'reg' function parameter in its
place.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Florian Westphal <fw@strlen.de>
---

diff --git a/iptables/nft-bridge.c b/iptables/nft-bridge.c
index 596dfdf8..d1385cc3 100644
--- a/iptables/nft-bridge.c
+++ b/iptables/nft-bridge.c
@@ -324,7 +324,6 @@ static int lookup_analyze_payloads(struct nft_xt_ctx *ctx,
 				   bool *dst, bool *ip)
 {
 	const struct nft_xt_ctx_reg *reg;
-	uint32_t sreg_count;
 	int val, val2 = -1;
 
 	reg = nft_xt_ctx_get_sreg(ctx, sreg);
@@ -336,7 +335,6 @@ static int lookup_analyze_payloads(struct nft_xt_ctx *ctx,
 		return -1;
 	}
 
-	sreg_count = sreg;
 	switch (key_len) {
 	case 12: /* ether + ipv4addr */
 		val = lookup_check_ether_payload(reg->payload.base,
@@ -349,9 +347,9 @@ static int lookup_analyze_payloads(struct nft_xt_ctx *ctx,
 			return -1;
 		}
 
-		sreg_count = nft_get_next_reg(sreg_count, ETH_ALEN);
+		sreg = nft_get_next_reg(sreg, ETH_ALEN);
 
-		reg = nft_xt_ctx_get_sreg(ctx, sreg_count);
+		reg = nft_xt_ctx_get_sreg(ctx, sreg);
 		if (!reg) {
 			ctx->errmsg = "next lookup register is invalid";
 			return -1;