You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
43 lines
1.4 KiB
43 lines
1.4 KiB
3 weeks ago
|
From 37622ca0f4c29c9a06b0d2f3f1abc6695c57d560 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Sutter <phil@nwl.cc>
|
||
|
|
Date: Sun, 19 Nov 2023 13:18:26 +0100
|
||
|
|
Subject: [PATCH] xshared: struct xt_cmd_parse::xlate is unused
|
||
|
|
|
||
|
|
Drop the boolean, it was meant to disable some existence checks in
|
||
|
|
do_parse() prior to the caching rework. Now that do_parse() runs before
|
||
|
|
any caching is done, the checks in question don't exist anymore so drop
|
||
|
|
this relict.
|
||
|
|
|
||
|
|
Fixes: a7f1e208cdf9c ("nft: split parsing from netlink commands")
|
||
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
||
|
|
(cherry picked from commit b180d9c86d2cce6ab6fd3e3617faf320a8a1babb)
|
||
|
|
---
|
||
|
|
iptables/xshared.h | 1 -
|
||
|
|
iptables/xtables-translate.c | 1 -
|
||
|
|
2 files changed, 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/iptables/xshared.h b/iptables/xshared.h
|
||
|
|
index 5586385456a4d..c77556a1987dc 100644
|
||
|
|
--- a/iptables/xshared.h
|
||
|
|
+++ b/iptables/xshared.h
|
||
|
|
@@ -284,7 +284,6 @@ struct xt_cmd_parse {
|
||
|
|
bool restore;
|
||
|
|
int line;
|
||
|
|
int verbose;
|
||
|
|
- bool xlate;
|
||
|
|
struct xt_cmd_parse_ops *ops;
|
||
|
|
};
|
||
|
|
|
||
|
|
diff --git a/iptables/xtables-translate.c b/iptables/xtables-translate.c
|
||
|
|
index 88e0a6b639494..c019cd2991305 100644
|
||
|
|
--- a/iptables/xtables-translate.c
|
||
|
|
+++ b/iptables/xtables-translate.c
|
||
|
|
@@ -249,7 +249,6 @@ static int do_command_xlate(struct nft_handle *h, int argc, char *argv[],
|
||
|
|
.table = *table,
|
||
|
|
.restore = restore,
|
||
|
|
.line = line,
|
||
|
|
- .xlate = true,
|
||
|
|
.ops = &h->ops->cmd_parse,
|
||
|
|
};
|
||
|
|
struct iptables_command_state cs = {
|