diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-08 13:39:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-08 13:39:54 -0700 |
| commit | fd1cc4802482d13ba1dbc44b390c5a6b16411a03 (patch) | |
| tree | c9ce26890f0e8da455396121e3f8ed4dfb9daad2 /include | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
| parent | 83731671d9e6878c0a05d309c68fb71c16d3235a (diff) | |
| download | linux-fd1cc4802482d13ba1dbc44b390c5a6b16411a03.tar.gz linux-fd1cc4802482d13ba1dbc44b390c5a6b16411a03.tar.bz2 linux-fd1cc4802482d13ba1dbc44b390c5a6b16411a03.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_expect.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h index ab17a159ac66..a9652806d0df 100644 --- a/include/net/netfilter/nf_conntrack_expect.h +++ b/include/net/netfilter/nf_conntrack_expect.h @@ -99,9 +99,12 @@ void nf_ct_expect_init(struct nf_conntrack_expect *, unsigned int, u_int8_t, const union nf_inet_addr *, u_int8_t, const __be16 *, const __be16 *); void nf_ct_expect_put(struct nf_conntrack_expect *exp); -int nf_ct_expect_related(struct nf_conntrack_expect *expect); int nf_ct_expect_related_report(struct nf_conntrack_expect *expect, u32 pid, int report); +static inline int nf_ct_expect_related(struct nf_conntrack_expect *expect) +{ + return nf_ct_expect_related_report(expect, 0, 0); +} #endif /*_NF_CONNTRACK_EXPECT_H*/ |