diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-08-26 22:48:49 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 18:18:20 -0400 |
commit | 6a28ec8cd0c6993a4ac0d52f4347f7ed077b5cac (patch) | |
tree | ad18c4377c2ce5fb9f0cb859d297498dcda20f10 /net | |
parent | e5d679f33900c71d1a76ba07c5b04055abd34480 (diff) |
[NETFILTER]: Fix nf_conntrack_ftp.c build.
Noticed by Adrian Bunk.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-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 @@ | |||
21 | #include <linux/ip.h> | 21 | #include <linux/ip.h> |
22 | #include <linux/ipv6.h> | 22 | #include <linux/ipv6.h> |
23 | #include <linux/ctype.h> | 23 | #include <linux/ctype.h> |
24 | #include <linux/inet.h> | ||
24 | #include <net/checksum.h> | 25 | #include <net/checksum.h> |
25 | #include <net/tcp.h> | 26 | #include <net/tcp.h> |
26 | 27 | ||
@@ -114,7 +115,8 @@ static struct ftp_search { | |||
114 | static int | 115 | static int |
115 | get_ipv6_addr(const char *src, size_t dlen, struct in6_addr *dst, u_int8_t term) | 116 | get_ipv6_addr(const char *src, size_t dlen, struct in6_addr *dst, u_int8_t term) |
116 | { | 117 | { |
117 | int ret = in6_pton(src, min_t(size_t, dlen, 0xffff), dst, term, &end); | 118 | const char *end; |
119 | int ret = in6_pton(src, min_t(size_t, dlen, 0xffff), (u8 *)dst, term, &end); | ||
118 | if (ret > 0) | 120 | if (ret > 0) |
119 | return (int)(end - src); | 121 | return (int)(end - src); |
120 | return 0; | 122 | return 0; |