2005-03-10 22:31:51

by Russell King

[permalink] [raw]
Subject: Netfilter ipt_hashlimit

With current-ish Linus 2.6 BK, I'm seeing this:

net/ipv4/netfilter/ipt_hashlimit.c:96: warning: type defaults to `int' in declaration of `DECLARE_LOCK'
net/ipv4/netfilter/ipt_hashlimit.c:96: warning: parameter names (without types) in function declaration
net/ipv4/netfilter/ipt_hashlimit.c: In function `htable_create':
net/ipv4/netfilter/ipt_hashlimit.c:237: warning: implicit declaration of function `LOCK_BH'
net/ipv4/netfilter/ipt_hashlimit.c:237: error: `hashlimit_lock' undeclared (first use in this function)
net/ipv4/netfilter/ipt_hashlimit.c:237: error: (Each undeclared identifier is reported only once/home/rmk/bk/linux-2.6-rmk/net/ipv4/netfilter/ipt_hashlimit.c:237: error: for each function it appears in.)
net/ipv4/netfilter/ipt_hashlimit.c:239: warning: implicit declaration of function `UNLOCK_BH'
net/ipv4/netfilter/ipt_hashlimit.c: In function `htable_find_get':
net/ipv4/netfilter/ipt_hashlimit.c:305: error: `hashlimit_lock' undeclared (first use in this function)
net/ipv4/netfilter/ipt_hashlimit.c: In function `htable_put':
net/ipv4/netfilter/ipt_hashlimit.c:321: error: `hashlimit_lock' undeclared (first use in this function)
net/ipv4/netfilter/ipt_hashlimit.c: At top level:
net/ipv4/netfilter/ipt_hashlimit.c:96: warning: `DECLARE_LOCK' declared `static' but never defined

Looks like ipt_hashlimit.c is missing an include?

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 Serial core


2005-03-11 12:17:56

by Herbert Xu

[permalink] [raw]
Subject: Re: Netfilter ipt_hashlimit

Russell King <[email protected]> wrote:
> With current-ish Linus 2.6 BK, I'm seeing this:
>
> net/ipv4/netfilter/ipt_hashlimit.c:96: warning: type defaults to `int' in declaration of `DECLARE_LOCK'
> net/ipv4/netfilter/ipt_hashlimit.c:96: warning: parameter names (without types) in function declaration
>
> Looks like ipt_hashlimit.c is missing an include?

Indeed. It should include lockhelp.h directly.

Signed-off-by: Herbert Xu <[email protected]>

Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
===== net/ipv4/netfilter/ipt_hashlimit.c 1.10 vs edited =====
--- 1.10/net/ipv4/netfilter/ipt_hashlimit.c 2005-03-11 07:06:22 +11:00
+++ edited/net/ipv4/netfilter/ipt_hashlimit.c 2005-03-11 22:56:24 +11:00
@@ -37,6 +37,7 @@

#include <linux/netfilter_ipv4/ip_tables.h>
#include <linux/netfilter_ipv4/ipt_hashlimit.h>
+#include <linux/netfilter_ipv4/lockhelp.h>

/* FIXME: this is just for IP_NF_ASSERRT */
#include <linux/netfilter_ipv4/ip_conntrack.h>

2005-03-15 05:44:12

by David Miller

[permalink] [raw]
Subject: Re: Netfilter ipt_hashlimit

On Fri, 11 Mar 2005 23:05:11 +1100
Herbert Xu <[email protected]> wrote:

> Russell King <[email protected]> wrote:
> > With current-ish Linus 2.6 BK, I'm seeing this:
> >
> > net/ipv4/netfilter/ipt_hashlimit.c:96: warning: type defaults to `int' in declaration of `DECLARE_LOCK'
> > net/ipv4/netfilter/ipt_hashlimit.c:96: warning: parameter names (without types) in function declaration
> >
> > Looks like ipt_hashlimit.c is missing an include?
>
> Indeed. It should include lockhelp.h directly.
>
> Signed-off-by: Herbert Xu <[email protected]>

Applied, thanks Herbert.