diff options
| author |   Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-08 11:35:10 +0200 |
|---|---|---|
| committer |   Patrick McHardy <kaber@trash.net> | 2008-10-08 11:35:10 +0200 |
| commit | 3bb0d1c00f86b13bb184193a8f0189ddd6f0459f (patch) | |
| tree | 8568fd96a42abf8d64eb83c8afcb1adcdc4bd394 /net/netfilter/nf_conntrack_pptp.c | |
| parent | netfilter: netns nf_conntrack: H323 conntracking in netns (diff) | |
| download | linux-dev-3bb0d1c00f86b13bb184193a8f0189ddd6f0459f.tar.xz linux-dev-3bb0d1c00f86b13bb184193a8f0189ddd6f0459f.zip | |
netfilter: netns nf_conntrack: GRE conntracking in netns
* make keymap list per-netns
* per-netns keymal lock (not strictly necessary)
* flush keymap at netns stop and module unload.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_pptp.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_pptp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_pptp.c b/net/netfilter/nf_conntrack_pptp.c index 5db7df5d19b7..e47d5de41cc2 100644 --- a/net/netfilter/nf_conntrack_pptp.c +++ b/net/netfilter/nf_conntrack_pptp.c @@ -602,7 +602,7 @@ static int __init nf_conntrack_pptp_init(void) static void __exit nf_conntrack_pptp_fini(void) { nf_conntrack_helper_unregister(&pptp); - nf_ct_gre_keymap_flush(); + nf_ct_gre_keymap_flush(&init_net); } module_init(nf_conntrack_pptp_init); |