diff --git a/[refs] b/[refs] index e5ef119bfa97..a68dffaf9b94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be00c8e48993368663e2714bd1e7c886b7736406 +refs/heads/master: d73468533451fd896324058d9ba649c11ba3e3ee diff --git a/trunk/net/netfilter/nf_conntrack_ftp.c b/trunk/net/netfilter/nf_conntrack_ftp.c index 10836fc22a44..05cb78ca90ae 100644 --- a/trunk/net/netfilter/nf_conntrack_ftp.c +++ b/trunk/net/netfilter/nf_conntrack_ftp.c @@ -586,6 +586,7 @@ static int __init nf_conntrack_ftp_init(void) for (j = 0; j < 2; j++) { ftp[i][j].tuple.src.u.tcp.port = htons(ports[i]); ftp[i][j].tuple.dst.protonum = IPPROTO_TCP; + ftp[i][j].mask.src.l3num = 0xFFFF; ftp[i][j].mask.src.u.tcp.port = 0xFFFF; ftp[i][j].mask.dst.protonum = 0xFF; ftp[i][j].max_expected = 1;