diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-08-26 19:48:49 -0700 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 15:18:20 -0700 |
commit | 6a28ec8cd0c6993a4ac0d52f4347f7ed077b5cac (patch) | |
tree | ad18c4377c2ce5fb9f0cb859d297498dcda20f10 /net/netfilter/nf_conntrack_ftp.c | |
parent | e5d679f33900c71d1a76ba07c5b04055abd34480 (diff) | |
download | linux-stable-6a28ec8cd0c6993a4ac0d52f4347f7ed077b5cac.tar.gz linux-stable-6a28ec8cd0c6993a4ac0d52f4347f7ed077b5cac.tar.bz2 linux-stable-6a28ec8cd0c6993a4ac0d52f4347f7ed077b5cac.zip |
[NETFILTER]: Fix nf_conntrack_ftp.c build.
Noticed by Adrian Bunk.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_ftp.c')
-rw-r--r-- | net/netfilter/nf_conntrack_ftp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c index 9dccb4039889..0c17a5bd112b 100644 --- a/net/netfilter/nf_conntrack_ftp.c +++ b/net/netfilter/nf_conntrack_ftp.c @@ -21,6 +21,7 @@ #include <linux/ip.h> #include <linux/ipv6.h> #include <linux/ctype.h> +#include <linux/inet.h> #include <net/checksum.h> #include <net/tcp.h> @@ -114,7 +115,8 @@ static struct ftp_search { static int get_ipv6_addr(const char *src, size_t dlen, struct in6_addr *dst, u_int8_t term) { - int ret = in6_pton(src, min_t(size_t, dlen, 0xffff), dst, term, &end); + const char *end; + int ret = in6_pton(src, min_t(size_t, dlen, 0xffff), (u8 *)dst, term, &end); if (ret > 0) return (int)(end - src); return 0; |