Skip to contentSkip to conversation

netfilter: arp_tables: remove the 32bit compat interface

PATCH New Florian Westphal 1 participant 1 message Aug 25

Subsystems (2)
lore
Share & tools
lore

Florian Westphal

author maintainer
#0 lore raw

PATCH 1/1 netfilter: arp_tables: remove the 32bit compat interface

This feature is required to use 32bit arptables binary on 64bit kernels. It's already off in many distributions including Debian and Fedora for many years.

Zap arptables first, it's the most esoteric of the 4 flavors.

---
passing this via nf, I want to avoid future bug fixes in nf that would then always collide with nf-next. I think ebtables32 is another good candidate. If you prefer to nuke everyhing at once please let me know. Plan was to nuke ebtables32 in next cycle and ip/ip6tables after that.

 include/linux/netfilter_arp/arp_tables.h |  19 -
 net/ipv4/netfilter/arp_tables.c          | 472 +----------------------
 2 files changed, 3 insertions(+), 488 deletions(-)
include/linux/netfilter_arp/arp_tables.h +0 -19
index 05631a25e622..8b8d472eff34 100644
@@ -56,23 +56,4 @@ void arpt_unregister_table(struct net *net, const char *name);
 extern unsigned int arpt_do_table(void *priv, struct sk_buff *skb,
 				  const struct nf_hook_state *state);
 
-#ifdef CONFIG_NETFILTER_XTABLES_COMPAT
-#include <net/compat.h>
-
-struct compat_arpt_entry {
-	struct arpt_arp arp;
-	__u16 target_offset;
-	__u16 next_offset;
-	compat_uint_t comefrom;
-	struct compat_xt_counters counters;
-	unsigned char elems[];
-};
-
-static inline struct xt_entry_target *
-compat_arpt_get_target(struct compat_arpt_entry *e)
-{
-	return (void *)e + e->target_offset;
-}
-
-#endif /* CONFIG_COMPAT */
 #endif /* _ARPTABLES_H */
net/ipv4/netfilter/arp_tables.c +3 -469

525 lines not on this page · raw message

Signature · 1 line
2.55.0