Commit 72f36ec1 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller

[NETFILTER]: ip6_tables: kill a few useless defines/forward declarations

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b386d9f5
...@@ -31,9 +31,6 @@ MODULE_LICENSE("GPL"); ...@@ -31,9 +31,6 @@ MODULE_LICENSE("GPL");
MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>"); MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
MODULE_DESCRIPTION("IPv6 packet filter"); MODULE_DESCRIPTION("IPv6 packet filter");
#define IPV6_HDR_LEN (sizeof(struct ipv6hdr))
#define IPV6_OPTHDR_LEN (sizeof(struct ipv6_opt_hdr))
/*#define DEBUG_IP_FIREWALL*/ /*#define DEBUG_IP_FIREWALL*/
/*#define DEBUG_ALLOW_ALL*/ /* Useful for remote debugging */ /*#define DEBUG_ALLOW_ALL*/ /* Useful for remote debugging */
/*#define DEBUG_IP_FIREWALL_USER*/ /*#define DEBUG_IP_FIREWALL_USER*/
...@@ -76,12 +73,6 @@ do { \ ...@@ -76,12 +73,6 @@ do { \
Hence the start of any table is given by get_table() below. */ Hence the start of any table is given by get_table() below. */
#if 0
#define down(x) do { printk("DOWN:%u:" #x "\n", __LINE__); down(x); } while(0)
#define down_interruptible(x) ({ int __r; printk("DOWNi:%u:" #x "\n", __LINE__); __r = down_interruptible(x); if (__r != 0) printk("ABORT-DOWNi:%u\n", __LINE__); __r; })
#define up(x) do { printk("UP:%u:" #x "\n", __LINE__); up(x); } while(0)
#endif
/* Check for an extension */ /* Check for an extension */
int int
ip6t_ext_hdr(u8 nexthdr) ip6t_ext_hdr(u8 nexthdr)
...@@ -399,9 +390,8 @@ ip6t_do_table(struct sk_buff *skb, ...@@ -399,9 +390,8 @@ ip6t_do_table(struct sk_buff *skb,
goto no_match; goto no_match;
ADD_COUNTER(e->counters, ADD_COUNTER(e->counters,
ntohs(ipv6_hdr(skb)->payload_len) ntohs(ipv6_hdr(skb)->payload_len) +
+ IPV6_HDR_LEN, sizeof(struct ipv6hdr), 1);
1);
t = ip6t_get_target(e); t = ip6t_get_target(e);
IP_NF_ASSERT(t->u.kernel.target); IP_NF_ASSERT(t->u.kernel.target);
...@@ -657,8 +647,6 @@ check_match(struct ip6t_entry_match *m, ...@@ -657,8 +647,6 @@ check_match(struct ip6t_entry_match *m,
return ret; return ret;
} }
static struct xt_target ip6t_standard_target;
static inline int static inline int
check_entry(struct ip6t_entry *e, const char *name, unsigned int size, check_entry(struct ip6t_entry *e, const char *name, unsigned int size,
unsigned int *i) unsigned int *i)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment