diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-11 12:41:09 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-11 12:41:09 +1100 |
| commit | 5cdb6688c5db7f92821db5ef2ca3c0c0ff52c23b (patch) | |
| tree | ecbf35920ddeb05781f3b58f26dbfa5407a8a314 /net/ipv4/netfilter/nf_nat_snmp_basic.c | |
| parent | 2e90d1edd450555b4daa96bca69f61be336baf1e (diff) | |
| parent | 33175d84ee3fa29991adb80513683e010769e807 (diff) | |
Merge remote-tracking branch 'net/master'
Conflicts:
drivers/net/Kconfig
lib/Makefile
Diffstat (limited to 'net/ipv4/netfilter/nf_nat_snmp_basic.c')
| -rw-r--r-- | net/ipv4/netfilter/nf_nat_snmp_basic.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c index ee5f419d0a56..8812a02078ab 100644 --- a/net/ipv4/netfilter/nf_nat_snmp_basic.c +++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c @@ -54,6 +54,7 @@ #include <net/netfilter/nf_conntrack_expect.h> #include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_nat_helper.h> +#include <linux/netfilter/nf_conntrack_snmp.h> MODULE_LICENSE("GPL"); MODULE_AUTHOR("James Morris <jmorris@intercode.com.au>"); @@ -1310,9 +1311,9 @@ static int __init nf_nat_snmp_basic_init(void) { int ret = 0; - ret = nf_conntrack_helper_register(&snmp_helper); - if (ret < 0) - return ret; + BUG_ON(nf_nat_snmp_hook != NULL); + rcu_assign_pointer(nf_nat_snmp_hook, help); + ret = nf_conntrack_helper_register(&snmp_trap_helper); if (ret < 0) { nf_conntrack_helper_unregister(&snmp_helper); @@ -1323,7 +1324,7 @@ static int __init nf_nat_snmp_basic_init(void) static void __exit nf_nat_snmp_basic_fini(void) { - nf_conntrack_helper_unregister(&snmp_helper); + rcu_assign_pointer(nf_nat_snmp_hook, NULL); nf_conntrack_helper_unregister(&snmp_trap_helper); } |