From a82d0ba5170816811b8bdefaca351f4cb168a94f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 9 Jan 2014 10:09:04 +0100 Subject: [PATCH] compat_xtables: remove unused xtnu_request_find_match The xt_find_match function is also getting unexported in 3.14. --- extensions/compat_xtables.c | 24 ------------------------ extensions/compat_xtables.h | 2 -- extensions/compat_xtnu.h | 2 -- 3 files changed, 28 deletions(-) diff --git a/extensions/compat_xtables.c b/extensions/compat_xtables.c index 1437d7e..23bc997 100644 --- a/extensions/compat_xtables.c +++ b/extensions/compat_xtables.c @@ -104,30 +104,6 @@ void xtnu_unregister_targets(struct xtnu_target *nt, unsigned int num) } EXPORT_SYMBOL_GPL(xtnu_unregister_targets); -struct xt_match *xtnu_request_find_match(unsigned int af, const char *name, - uint8_t revision) -{ - static const char *const xt_prefix[] = { - [AF_UNSPEC] = "x", - [AF_INET] = "ip", - [AF_INET6] = "ip6", -#ifdef AF_ARP - [AF_ARP] = "arp", -#elif defined(NF_ARP) && NF_ARP != AF_UNSPEC - [NF_ARP] = "arp", -#endif - }; - struct xt_match *match; - - match = try_then_request_module(xt_find_match(af, name, revision), - "%st_%s", xt_prefix[af], name); - if (IS_ERR(match) || match == NULL) - return NULL; - - return match; -} -EXPORT_SYMBOL_GPL(xtnu_request_find_match); - int xtnu_ip_route_me_harder(struct sk_buff **pskb, unsigned int addr_type) { return ip_route_me_harder(*pskb, addr_type); diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h index 64ba479..11723e9 100644 --- a/extensions/compat_xtables.h +++ b/extensions/compat_xtables.h @@ -53,8 +53,6 @@ #define xt_register_targets xtnu_register_targets #define xt_unregister_targets xtnu_unregister_targets -#define xt_request_find_match xtnu_request_find_match - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) static inline struct inode *file_inode(struct file *f) { diff --git a/extensions/compat_xtnu.h b/extensions/compat_xtnu.h index 106ca4c..5c01815 100644 --- a/extensions/compat_xtnu.h +++ b/extensions/compat_xtnu.h @@ -70,8 +70,6 @@ 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 struct xt_match *xtnu_request_find_match(unsigned int, - const char *, uint8_t); extern void xtnu_proto_csum_replace4(__u16 __bitwise *, struct sk_buff *, __be32, __be32, bool); extern int xtnu_ipv6_skip_exthdr(const struct sk_buff *, int,