diff options
author | Patrick McHardy <kaber@trash.net> | 2007-07-08 01:30:49 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-11 01:17:53 -0400 |
commit | 6823645d608541c2c69e8a99454936e058c294e0 (patch) | |
tree | e7b8b9200b4b03b7b787fc55f92c37c19076c225 /net/ipv4/netfilter/nf_nat_ftp.c | |
parent | 53aba5979e1d964c0234816eda2316f1c2e7946d (diff) |
[NETFILTER]: nf_conntrack_expect: function naming unification
Currently there is a wild mix of nf_conntrack_expect_, nf_ct_exp_,
expect_, exp_, ...
Consistently use nf_ct_ as prefix for exported functions.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/netfilter/nf_nat_ftp.c')
-rw-r--r-- | net/ipv4/netfilter/nf_nat_ftp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/nf_nat_ftp.c b/net/ipv4/netfilter/nf_nat_ftp.c index e6bc8e5a72f..cae4b460aee 100644 --- a/net/ipv4/netfilter/nf_nat_ftp.c +++ b/net/ipv4/netfilter/nf_nat_ftp.c | |||
@@ -131,7 +131,7 @@ static unsigned int nf_nat_ftp(struct sk_buff **pskb, | |||
131 | /* Try to get same port: if not, try to change it. */ | 131 | /* Try to get same port: if not, try to change it. */ |
132 | for (port = ntohs(exp->saved_proto.tcp.port); port != 0; port++) { | 132 | for (port = ntohs(exp->saved_proto.tcp.port); port != 0; port++) { |
133 | exp->tuple.dst.u.tcp.port = htons(port); | 133 | exp->tuple.dst.u.tcp.port = htons(port); |
134 | if (nf_conntrack_expect_related(exp) == 0) | 134 | if (nf_ct_expect_related(exp) == 0) |
135 | break; | 135 | break; |
136 | } | 136 | } |
137 | 137 | ||
@@ -139,7 +139,7 @@ static unsigned int nf_nat_ftp(struct sk_buff **pskb, | |||
139 | return NF_DROP; | 139 | return NF_DROP; |
140 | 140 | ||
141 | if (!mangle[type](pskb, newip, port, matchoff, matchlen, ct, ctinfo)) { | 141 | if (!mangle[type](pskb, newip, port, matchoff, matchlen, ct, ctinfo)) { |
142 | nf_conntrack_unexpect_related(exp); | 142 | nf_ct_unexpect_related(exp); |
143 | return NF_DROP; | 143 | return NF_DROP; |
144 | } | 144 | } |
145 | return NF_ACCEPT; | 145 | return NF_ACCEPT; |