瀏覽代碼

[NETFILTER]: Fix nf_conntrack_ftp.c build.

Noticed by Adrian Bunk.

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 18 年之前
父節點
當前提交
6a28ec8cd0
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      net/netfilter/nf_conntrack_ftp.c

+ 3 - 1
net/netfilter/nf_conntrack_ftp.c

@@ -21,6 +21,7 @@
 #include <linux/ip.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/ipv6.h>
 #include <linux/ctype.h>
 #include <linux/ctype.h>
+#include <linux/inet.h>
 #include <net/checksum.h>
 #include <net/checksum.h>
 #include <net/tcp.h>
 #include <net/tcp.h>
 
 
@@ -114,7 +115,8 @@ static struct ftp_search {
 static int
 static int
 get_ipv6_addr(const char *src, size_t dlen, struct in6_addr *dst, u_int8_t term)
 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)
 	if (ret > 0)
 		return (int)(end - src);
 		return (int)(end - src);
 	return 0;
 	return 0;