summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2019-02-07 09:20:10 +0100
committerFlorian Westphal <fw@strlen.de>2019-02-11 17:13:09 +0100
commit519f5bcd9c07e0092a1a019176c82fb3bfbd9ced (patch)
tree5cde735fa6d5d8cc2dd6582441983b26bdbe2692
parentaff1162b3e4b7ef805425a40306044c7d7dddc67 (diff)
nft: Eliminate dead code in __nft_rule_list
If passed a rulenum > 0, the function uses nftnl_rule_lookup_byindex() and returns early. Negative rulenum values are not supposed to happen, so the remaining code which iterates over the full list of rules does not need to respect rulenum anymore. Fixes: 039b048965210 ("nft: Make use of nftnl_rule_lookup_byindex()") Signed-off-by: Phil Sutter <phil@nwl.cc> Signed-off-by: Florian Westphal <fw@strlen.de>
-rw-r--r--iptables/nft.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/iptables/nft.c b/iptables/nft.c
index 2d527358..d708fb61 100644
--- a/iptables/nft.c
+++ b/iptables/nft.c
@@ -2331,18 +2331,7 @@ __nft_rule_list(struct nft_handle *h, struct nftnl_chain *c,
r = nftnl_rule_iter_next(iter);
while (r != NULL) {
- rule_ctr++;
-
- if (rulenum > 0 && rule_ctr != rulenum) {
- /* List by rule number case */
- goto next;
- }
-
- cb(r, rule_ctr, format);
- if (rulenum > 0)
- break;
-
-next:
+ cb(r, ++rule_ctr, format);
r = nftnl_rule_iter_next(iter);
}