]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[NETFILTER]: Fix nf_conntrack_ftp.c build.
authorDavid S. Miller <davem@sunset.davemloft.net>
Sun, 27 Aug 2006 02:48:49 +0000 (19:48 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 22 Sep 2006 22:18:20 +0000 (15:18 -0700)
Noticed by Adrian Bunk.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nf_conntrack_ftp.c

index 9dccb40398890bb602580818988cf0e88fad0f70..0c17a5bd112bb1792d32bffe662ece19d2987584 100644 (file)
@@ -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;