From 7cf7250e071ad9c5c92e75d0985d491c8faef29e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 9 Jan 2014 10:16:02 +0100 Subject: [PATCH] compat_xtables: remove unused xtnu_ip_route_me_harder --- extensions/compat_xtables.c | 6 ------ extensions/compat_xtables.h | 1 - extensions/compat_xtnu.h | 1 - extensions/xt_DELUDE.c | 2 +- extensions/xt_ECHO.c | 2 +- extensions/xt_TARPIT.c | 2 +- 6 files changed, 3 insertions(+), 11 deletions(-) diff --git a/extensions/compat_xtables.c b/extensions/compat_xtables.c index 5db83af..acf3606 100644 --- a/extensions/compat_xtables.c +++ b/extensions/compat_xtables.c @@ -104,12 +104,6 @@ void xtnu_unregister_targets(struct xtnu_target *nt, unsigned int num) } EXPORT_SYMBOL_GPL(xtnu_unregister_targets); -int xtnu_ip_route_me_harder(struct sk_buff **pskb, unsigned int addr_type) -{ - return ip_route_me_harder(*pskb, addr_type); -} -EXPORT_SYMBOL_GPL(xtnu_ip_route_me_harder); - void *HX_memmem(const void *space, size_t spacesize, const void *point, size_t pointsize) { diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h index a23edcb..d9fafbc 100644 --- a/extensions/compat_xtables.h +++ b/extensions/compat_xtables.h @@ -45,7 +45,6 @@ # define NIPQUAD_FMT "%u.%u.%u.%u" #endif -#define ip_route_me_harder xtnu_ip_route_me_harder #define xt_target xtnu_target #define xt_register_target xtnu_register_target #define xt_unregister_target xtnu_unregister_target diff --git a/extensions/compat_xtnu.h b/extensions/compat_xtnu.h index 87c61f7..1dceb21 100644 --- a/extensions/compat_xtnu.h +++ b/extensions/compat_xtnu.h @@ -59,7 +59,6 @@ static inline struct xtnu_target *xtcompat_nutarget(const struct xt_target *t) } extern int xtnu_ip_local_out(struct sk_buff *); -extern int xtnu_ip_route_me_harder(struct sk_buff **, unsigned int); extern int xtnu_register_match(struct xtnu_match *); extern int xtnu_ip_route_output_key(void *, struct rtable **, struct flowi *); extern void xtnu_unregister_match(struct xtnu_match *); diff --git a/extensions/xt_DELUDE.c b/extensions/xt_DELUDE.c index 06510bd..466541e 100644 --- a/extensions/xt_DELUDE.c +++ b/extensions/xt_DELUDE.c @@ -116,7 +116,7 @@ static void delude_send_reset(struct sk_buff *oldskb, unsigned int hook) /* ip_route_me_harder expects skb->dst to be set */ skb_dst_set(nskb, dst_clone(skb_dst(oldskb))); - if (ip_route_me_harder(&nskb, addr_type)) + if (ip_route_me_harder(nskb, addr_type)) goto free_nskb; else niph = ip_hdr(nskb); diff --git a/extensions/xt_ECHO.c b/extensions/xt_ECHO.c index 4c31c51..c3d4ee0 100644 --- a/extensions/xt_ECHO.c +++ b/extensions/xt_ECHO.c @@ -192,7 +192,7 @@ echo_tg4(struct sk_buff **poldskb, const struct xt_action_param *par) /* ip_route_me_harder expects the skb's dst to be set */ skb_dst_set(newskb, dst_clone(skb_dst(oldskb))); - if (ip_route_me_harder(&newskb, RTN_UNSPEC) != 0) + if (ip_route_me_harder(newskb, RTN_UNSPEC) != 0) goto free_nskb; newip->ttl = ip4_dst_hoplimit(skb_dst(newskb)); diff --git a/extensions/xt_TARPIT.c b/extensions/xt_TARPIT.c index 0ca27a4..bb41057 100644 --- a/extensions/xt_TARPIT.c +++ b/extensions/xt_TARPIT.c @@ -256,7 +256,7 @@ static void tarpit_tcp4(struct sk_buff *oldskb, unsigned int hook, #endif addr_type = RTN_LOCAL; - if (ip_route_me_harder(&nskb, addr_type)) + if (ip_route_me_harder(nskb, addr_type)) goto free_nskb; else niph = ip_hdr(nskb);