aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/nf_conntrack_helper.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-07-07 22:30:49 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-10 22:17:53 -0700
commit6823645d608541c2c69e8a99454936e058c294e0 (patch)
treee7b8b9200b4b03b7b787fc55f92c37c19076c225 /net/netfilter/nf_conntrack_helper.c
parent[NETFILTER]: nf_nat: use hlists for bysource hash (diff)
downloadlinux-dev-6823645d608541c2c69e8a99454936e058c294e0.tar.xz
linux-dev-6823645d608541c2c69e8a99454936e058c294e0.zip
[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/netfilter/nf_conntrack_helper.c')
-rw-r--r--net/netfilter/nf_conntrack_helper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
index 3fc6e9f0de1a..89a5f7333d38 100644
--- a/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@ -123,12 +123,12 @@ void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me)
list_del(&me->list);
/* Get rid of expectations */
- list_for_each_entry_safe(exp, tmp, &nf_conntrack_expect_list, list) {
+ list_for_each_entry_safe(exp, tmp, &nf_ct_expect_list, list) {
struct nf_conn_help *help = nfct_help(exp->master);
if ((help->helper == me || exp->helper == me) &&
del_timer(&exp->timeout)) {
nf_ct_unlink_expect(exp);
- nf_conntrack_expect_put(exp);
+ nf_ct_expect_put(exp);
}
}