summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-02-24 17:41:57 -0500
committerDavid S. Miller <davem@davemloft.net>2012-02-24 17:41:57 -0500
commite807e566e99b644d8d248ba9393a0ba3f1012fdc (patch)
treeea705f137653dc55dc9804d76f59536790aa35dd /include
parentbff528578fc3c4a14227b052a313109b5ffb73da (diff)
parent7d367e06688dc7a2cc98c2ace04e1296e1d987e2 (diff)
downloadlinux-e807e566e99b644d8d248ba9393a0ba3f1012fdc.tar.gz
linux-e807e566e99b644d8d248ba9393a0ba3f1012fdc.tar.bz2
linux-e807e566e99b644d8d248ba9393a0ba3f1012fdc.zip
Merge branch 'master' of git://1984.lsi.us.es/net
Diffstat (limited to 'include')
-rw-r--r--include/net/netfilter/nf_conntrack.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 8a2b0ae7dbd2..ab86036bbf0c 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -209,7 +209,7 @@ extern struct nf_conntrack_tuple_hash *
__nf_conntrack_find(struct net *net, u16 zone,
const struct nf_conntrack_tuple *tuple);
-extern void nf_conntrack_hash_insert(struct nf_conn *ct);
+extern int nf_conntrack_hash_check_insert(struct nf_conn *ct);
extern void nf_ct_delete_from_lists(struct nf_conn *ct);
extern void nf_ct_insert_dying_list(struct nf_conn *ct);