diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-25 02:21:45 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-25 02:21:45 -0500 |
| commit | c5e1fd8ccae09f574d6f978c90c2b968ee29030c (patch) | |
| tree | e4485dc086ce76c4ff2ff551246255f5de0a250b /include/net/netfilter/nf_conntrack_expect.h | |
| parent | 60b778ce519625102d3f72a2071ea72a05e990ce (diff) | |
| parent | ceb98d03eac5704820f2ac1f370c9ff385e3a9f5 (diff) | |
Merge branch 'nf-next' of git://1984.lsi.us.es/net-next
Diffstat (limited to 'include/net/netfilter/nf_conntrack_expect.h')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_expect.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h index 0f8a8c587532..4619caadd9d1 100644 --- a/include/net/netfilter/nf_conntrack_expect.h +++ b/include/net/netfilter/nf_conntrack_expect.h @@ -91,7 +91,6 @@ static inline void nf_ct_unlink_expect(struct nf_conntrack_expect *exp) void nf_ct_remove_expectations(struct nf_conn *ct); void nf_ct_unexpect_related(struct nf_conntrack_expect *exp); -void nf_ct_remove_userspace_expectations(void); /* Allocate space for an expectation: this is mandatory before calling nf_ct_expect_related. You will have to call put afterwards. */ |