diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-24 23:41:57 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-24 23:41:57 +0100 |
| commit | e807e566e99b644d8d248ba9393a0ba3f1012fdc (patch) | |
| tree | ea705f137653dc55dc9804d76f59536790aa35dd /include | |
| parent | gre: fix spelling in comments (diff) | |
| parent | netfilter: ctnetlink: fix soft lockup when netlink adds new entries (v2) (diff) | |
| download | linux-e807e566e99b644d8d248ba9393a0ba3f1012fdc.tar.xz 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.h | 2 |
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); |