]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
netfilter: nf_conntrack_proto_gre: switch to register_pernet_gen_subsys()
authorAlexey Dobriyan <adobriyan@gmail.com>
Fri, 31 Oct 2008 06:55:44 +0000 (23:55 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 31 Oct 2008 06:55:44 +0000 (23:55 -0700)
commit61e5744849cb936bf4361181b8f9ebccebf4d9db
treeede29906dfefdce4f1ad4f07fc18f1276cad62bd
parent485ac57bc1238719b1508f91b0f9eeda4a3c84bb
netfilter: nf_conntrack_proto_gre: switch to register_pernet_gen_subsys()

register_pernet_gen_device() can't be used is nf_conntrack_pptp module is
also used (compiled in or loaded).

Right now, proto_gre_net_exit() is called before nf_conntrack_pptp_net_exit().
The former shutdowns and frees GRE piece of netns, however the latter
absolutely needs it to flush keymap. Oops is inevitable.

Switch to shiny new register_pernet_gen_subsys() to get correct ordering in
netns ops list.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nf_conntrack_proto_gre.c