diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-12-24 21:09:10 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-12-26 19:36:33 -0800 |
| commit | fae718ddaf2b00e222dddec6717aca023376723c (patch) | |
| tree | a3ea0668f21555cca021f4d19ce5b22e6eca5c49 /include/net/netfilter | |
| parent | 81100eb80add328c4d2a377326f15aa0e7236398 (diff) | |
| download | talos-op-linux-fae718ddaf2b00e222dddec6717aca023376723c.tar.gz talos-op-linux-fae718ddaf2b00e222dddec6717aca023376723c.zip | |
[NETFILTER]: nf_conntrack_ipv4: fix module parameter compatibility
Some users do "modprobe ip_conntrack hashsize=...". Since we have the
module aliases this loads nf_conntrack_ipv4 and nf_conntrack, the
hashsize parameter is unknown for nf_conntrack_ipv4 however and makes
it fail.
Allow to specify hashsize= for both nf_conntrack and nf_conntrack_ipv4.
Note: the nf_conntrack message in the ringbuffer will display an
incorrect hashsize since nf_conntrack is first pulled in as a
dependency and calculates the size itself, then it gets changed
through a call to nf_conntrack_set_hashsize().
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/netfilter')
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index 90fb66d99d0c..4ac5ab187c2a 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -249,6 +249,7 @@ static inline int nf_ct_is_untracked(const struct sk_buff *skb) return (skb->nfct == &nf_conntrack_untracked.ct_general); } +extern int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp); extern unsigned int nf_conntrack_htable_size; extern int nf_conntrack_checksum; extern atomic_t nf_conntrack_count; |
