From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 17 Jul 2021 09:34:34 +0000 (+0200)
Subject: extensions: remove unused code from compat_xtnu.h
X-Git-Tag: v3.19~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d74a85f7000b769773da44e9df2b1b72086f482;p=thirdparty%2Fxtables-addons.git

extensions: remove unused code from compat_xtnu.h
---

diff --git a/extensions/compat_xtables.c b/extensions/compat_xtables.c
index d3312d5..1051204 100644
--- a/extensions/compat_xtables.c
+++ b/extensions/compat_xtables.c
@@ -23,7 +23,6 @@
 #include <net/route.h>
 #include <linux/export.h>
 #include "compat_skbuff.h"
-#include "compat_xtnu.h"
 #if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
 #	define WITH_IPV6 1
 #endif
diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index a97dd10..44ea7d3 100644
--- a/extensions/compat_xtables.h
+++ b/extensions/compat_xtables.h
@@ -2,7 +2,6 @@
 #include <linux/kernel.h>
 #include <linux/version.h>
 #include "compat_skbuff.h"
-#include "compat_xtnu.h"
 
 #define DEBUGP Use__pr_debug__instead
 
@@ -45,3 +44,5 @@ static inline struct net *par_net(const struct xt_action_param *par)
 #	define proc_lseek llseek
 #	define proc_release release
 #endif
+
+extern void *HX_memmem(const void *, size_t, const void *, size_t);
diff --git a/extensions/compat_xtnu.h b/extensions/compat_xtnu.h
deleted file mode 100644
index a2c1e5c..0000000
--- a/extensions/compat_xtnu.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-#include <linux/netfilter/x_tables.h>
-
-struct module;
-struct sk_buff;
-
-struct xtnu_match {
-	/*
-	 * Making it smaller by sizeof(void *) on purpose to catch
-	 * lossy translation, if any.
-	 */
-	char name[sizeof(((struct xt_match *)NULL)->name) - 1 - sizeof(void *)];
-	uint8_t revision;
-	bool (*match)(const struct sk_buff *, struct xt_action_param *);
-	int (*checkentry)(const struct xt_mtchk_param *);
-	void (*destroy)(const struct xt_mtdtor_param *);
-	struct module *me;
-	const char *table;
-	unsigned int matchsize, hooks;
-	unsigned short proto, family;
-
-	void *__compat_match;
-};
-
-struct xtnu_target {
-	char name[sizeof(((struct xt_target *)NULL)->name) - 1 - sizeof(void *)];
-	uint8_t revision;
-	unsigned int (*target)(struct sk_buff **,
-		const struct xt_action_param *);
-	int (*checkentry)(const struct xt_tgchk_param *);
-	void (*destroy)(const struct xt_tgdtor_param *);
-	struct module *me;
-	const char *table;
-	unsigned int targetsize, hooks;
-	unsigned short proto, family;
-
-	void *__compat_target;
-};
-
-static inline struct xtnu_match *xtcompat_numatch(const struct xt_match *m)
-{
-	void *q;
-	memcpy(&q, m->name + sizeof(m->name) - sizeof(void *), sizeof(void *));
-	return q;
-}
-
-static inline struct xtnu_target *xtcompat_nutarget(const struct xt_target *t)
-{
-	void *q;
-	memcpy(&q, t->name + sizeof(t->name) - sizeof(void *), sizeof(void *));
-	return q;
-}
-
-extern int xtnu_register_match(struct xtnu_match *);
-extern void xtnu_unregister_match(struct xtnu_match *);
-extern int xtnu_register_matches(struct xtnu_match *, unsigned int);
-extern void xtnu_unregister_matches(struct xtnu_match *, unsigned int);
-extern int xtnu_register_target(struct xtnu_target *);
-extern void xtnu_unregister_target(struct xtnu_target *);
-extern int xtnu_register_targets(struct xtnu_target *, unsigned int);
-extern void xtnu_unregister_targets(struct xtnu_target *, unsigned int);
-
-extern void *HX_memmem(const void *, size_t, const void *, size_t);