diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-05-19 15:44:27 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-06-06 01:35:10 +0200 |
commit | fb04883371f2cb7867d24783e7d590036dc9b548 (patch) | |
tree | afa3d3e6f852c19f193d7ada54819e6a59fab52b /net/netfilter/nf_conntrack_ftp.c | |
parent | 374eeb5a9d77ea719c5c46f4d70226623f4528ce (diff) | |
download | linux-stable-fb04883371f2cb7867d24783e7d590036dc9b548.tar.gz linux-stable-fb04883371f2cb7867d24783e7d590036dc9b548.tar.bz2 linux-stable-fb04883371f2cb7867d24783e7d590036dc9b548.zip |
netfilter: add more values to enum ip_conntrack_info
Following error is raised (and other similar ones) :
net/ipv4/netfilter/nf_nat_standalone.c: In function ‘nf_nat_fn’:
net/ipv4/netfilter/nf_nat_standalone.c:119:2: warning: case value ‘4’
not in enumerated type ‘enum ip_conntrack_info’
gcc barfs on adding two enum values and getting a not enumerated
result :
case IP_CT_RELATED+IP_CT_IS_REPLY:
Add missing enum values
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: David Miller <davem@davemloft.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_ftp.c')
-rw-r--r-- | net/netfilter/nf_conntrack_ftp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c index e17cb7c7dd8f..6f5801eac999 100644 --- a/net/netfilter/nf_conntrack_ftp.c +++ b/net/netfilter/nf_conntrack_ftp.c @@ -368,7 +368,7 @@ static int help(struct sk_buff *skb, /* Until there's been traffic both ways, don't look in packets. */ if (ctinfo != IP_CT_ESTABLISHED && - ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY) { + ctinfo != IP_CT_ESTABLISHED_REPLY) { pr_debug("ftp: Conntrackinfo = %u\n", ctinfo); return NF_ACCEPT; } |