aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>2006-11-28 20:35:23 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:31:21 -0500
commit468ec44bd5a863736d955f78b8c38896f26864a1 (patch)
tree6361aee3639141ce804284dc7a28c0ee631b939c /net/netfilter
parente4bd8bce3e8b53e2c0a0d5c9afbc29731e517f8d (diff)
[NETFILTER]: conntrack: add '_get' to {ip, nf}_conntrack_expect_find
We usually uses 'xxx_find_get' for function which increments reference count. Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/nf_conntrack_expect.c2
-rw-r--r--net/netfilter/nf_conntrack_netlink.c4
-rw-r--r--net/netfilter/nf_conntrack_standalone.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index 79cfd79a42f0..aa5903e4da11 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -68,7 +68,7 @@ __nf_conntrack_expect_find(const struct nf_conntrack_tuple *tuple)
68 68
69/* Just find a expectation corresponding to a tuple. */ 69/* Just find a expectation corresponding to a tuple. */
70struct nf_conntrack_expect * 70struct nf_conntrack_expect *
71nf_conntrack_expect_find(const struct nf_conntrack_tuple *tuple) 71nf_conntrack_expect_find_get(const struct nf_conntrack_tuple *tuple)
72{ 72{
73 struct nf_conntrack_expect *i; 73 struct nf_conntrack_expect *i;
74 74
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index dc0830220130..7357b8f47acd 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1284,7 +1284,7 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb,
1284 if (err < 0) 1284 if (err < 0)
1285 return err; 1285 return err;
1286 1286
1287 exp = nf_conntrack_expect_find(&tuple); 1287 exp = nf_conntrack_expect_find_get(&tuple);
1288 if (!exp) 1288 if (!exp)
1289 return -ENOENT; 1289 return -ENOENT;
1290 1290
@@ -1339,7 +1339,7 @@ ctnetlink_del_expect(struct sock *ctnl, struct sk_buff *skb,
1339 return err; 1339 return err;
1340 1340
1341 /* bump usage count to 2 */ 1341 /* bump usage count to 2 */
1342 exp = nf_conntrack_expect_find(&tuple); 1342 exp = nf_conntrack_expect_find_get(&tuple);
1343 if (!exp) 1343 if (!exp)
1344 return -ENOENT; 1344 return -ENOENT;
1345 1345
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 3db24f4f0f5b..be94b6359725 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -549,7 +549,7 @@ EXPORT_SYMBOL(__nf_conntrack_find);
549EXPORT_SYMBOL(nf_ct_unlink_expect); 549EXPORT_SYMBOL(nf_ct_unlink_expect);
550EXPORT_SYMBOL(nf_conntrack_hash_insert); 550EXPORT_SYMBOL(nf_conntrack_hash_insert);
551EXPORT_SYMBOL(__nf_conntrack_expect_find); 551EXPORT_SYMBOL(__nf_conntrack_expect_find);
552EXPORT_SYMBOL(nf_conntrack_expect_find); 552EXPORT_SYMBOL(nf_conntrack_expect_find_get);
553EXPORT_SYMBOL(nf_conntrack_expect_list); 553EXPORT_SYMBOL(nf_conntrack_expect_list);
554#if defined(CONFIG_NF_CT_NETLINK) || \ 554#if defined(CONFIG_NF_CT_NETLINK) || \
555 defined(CONFIG_NF_CT_NETLINK_MODULE) 555 defined(CONFIG_NF_CT_NETLINK_MODULE)