They don't exist in the legacy ABI, so don't pretend otherwise.
Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
---
iptables/nft-bridge.c | 10 +---------
iptables/xshared.h | 3 ---
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/iptables/nft-bridge.c b/iptables/nft-bridge.c
index 162a87e0bb3b..fcc516464643 100644
--- a/iptables/nft-bridge.c
+++ b/iptables/nft-bridge.c
@@ -406,7 +406,6 @@ static void print_matches_and_watchers(const struct iptables_command_state *cs,
}
}
-
static void nft_bridge_print_firewall(struct nftnl_rule *r, unsigned int num,
unsigned int format)
{
@@ -547,14 +546,7 @@ static bool nft_bridge_is_same(const void *data_a, const void *data_b)
}
}
- return is_same_interfaces((char *)a->in,
- (char *)a->out,
- a->in_mask,
- a->out_mask,
- (char *)b->in,
- (char *)b->out,
- b->in_mask,
- b->out_mask);
+ return strcmp(a->in, b->in) == 0 && strcmp(a->out, b->out) == 0;
}
static bool nft_bridge_rule_find(struct nft_family_ops *ops, struct nftnl_rule *r,
diff --git a/iptables/xshared.h b/iptables/xshared.h
index cec5a08a410a..01c0eb12abb5 100644
--- a/iptables/xshared.h
+++ b/iptables/xshared.h
@@ -76,9 +76,6 @@ struct ebt_entry {
unsigned char sourcemsk[6];
unsigned char destmac[6];
unsigned char destmsk[6];
-
- unsigned char in_mask[IFNAMSIZ];
- unsigned char out_mask[IFNAMSIZ];
};
struct iptables_command_state {
--
2.16.1
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
