diff options
author | Clark Williams <williams@redhat.com> | 2012-02-03 15:10:42 -0600 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-02-03 15:10:42 -0600 |
commit | 77f57fb93d132875acead3581bcdc5d2fefbe7a0 (patch) | |
tree | 5db5ccf5e1754248edc790e2f37f3a2b863f0ddb /net/netfilter/nfnetlink.c | |
parent | d28048db190097536aef2be5ee9a736bd7bb92eb (diff) | |
parent | 69bade053d0f2ef0c8ee98af9f6699a55a8d8bb9 (diff) |
Merge commit 'v3.2.3' into rt-3.2.3-rt10
Diffstat (limited to 'net/netfilter/nfnetlink.c')
-rw-r--r-- | net/netfilter/nfnetlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index c879c1a2370e..b4f8d849480c 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -59,7 +59,7 @@ int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n) nfnl_unlock(); return -EBUSY; } - RCU_INIT_POINTER(subsys_table[n->subsys_id], n); + rcu_assign_pointer(subsys_table[n->subsys_id], n); nfnl_unlock(); return 0; @@ -210,7 +210,7 @@ static int __net_init nfnetlink_net_init(struct net *net) if (!nfnl) return -ENOMEM; net->nfnl_stash = nfnl; - RCU_INIT_POINTER(net->nfnl, nfnl); + rcu_assign_pointer(net->nfnl, nfnl); return 0; } |