diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-04 16:06:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-04 16:06:40 +1100 |
| commit | 806834f526784fbddd3795fe435b687897962be5 (patch) | |
| tree | e945c9f6987684b98ee1f7acb104a603624634df /include/net/netfilter/nf_conntrack_helper.h | |
| parent | 4c1b5fa0d34e0e6a6a5ba54961ea11bb726db69c (diff) | |
| parent | a5b2db67139e991d9e9e19260989d0e66a03a2b2 (diff) | |
Merge commit 'net/master'
Conflicts:
MAINTAINERS
Diffstat (limited to 'include/net/netfilter/nf_conntrack_helper.h')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_helper.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h index 4ca125e9b3ce..f8060ab5a083 100644 --- a/include/net/netfilter/nf_conntrack_helper.h +++ b/include/net/netfilter/nf_conntrack_helper.h @@ -20,9 +20,7 @@ struct nf_conntrack_helper const char *name; /* name of the module */ struct module *me; /* pointer to self */ - unsigned int max_expected; /* Maximum number of concurrent - * expected connections */ - unsigned int timeout; /* timeout for expecteds */ + const struct nf_conntrack_expect_policy *expect_policy; /* Tuple of things we will help (compared against server response) */ struct nf_conntrack_tuple tuple; @@ -37,6 +35,7 @@ struct nf_conntrack_helper void (*destroy)(struct nf_conn *ct); int (*to_nlattr)(struct sk_buff *skb, const struct nf_conn *ct); + unsigned int expect_class_max; }; extern struct nf_conntrack_helper * |