Skip to content

Commit

Permalink
[NETFILTER]: ip6_tables: kill a few useless defines/forward declarations
Browse files Browse the repository at this point in the history
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Jan 28, 2008
1 parent b386d9f commit 72f36ec
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions net/ipv6/netfilter/ip6_tables.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ MODULE_LICENSE("GPL");
MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
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_ALLOW_ALL*/ /* Useful for remote debugging */
/*#define DEBUG_IP_FIREWALL_USER*/
Expand Down Expand Up @@ -76,12 +73,6 @@ do { \
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 */
int
ip6t_ext_hdr(u8 nexthdr)
Expand Down Expand Up @@ -399,9 +390,8 @@ ip6t_do_table(struct sk_buff *skb,
goto no_match;

ADD_COUNTER(e->counters,
ntohs(ipv6_hdr(skb)->payload_len)
+ IPV6_HDR_LEN,
1);
ntohs(ipv6_hdr(skb)->payload_len) +
sizeof(struct ipv6hdr), 1);

t = ip6t_get_target(e);
IP_NF_ASSERT(t->u.kernel.target);
Expand Down Expand Up @@ -657,8 +647,6 @@ check_match(struct ip6t_entry_match *m,
return ret;
}

static struct xt_target ip6t_standard_target;

static inline int
check_entry(struct ip6t_entry *e, const char *name, unsigned int size,
unsigned int *i)
Expand Down

0 comments on commit 72f36ec

Please sign in to comment.