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/ipv4/ipmr.c | |
| parent | d28048db190097536aef2be5ee9a736bd7bb92eb (diff) | |
| parent | 69bade053d0f2ef0c8ee98af9f6699a55a8d8bb9 (diff) | |
Merge commit 'v3.2.3' into rt-3.2.3-rt10
Diffstat (limited to 'net/ipv4/ipmr.c')
| -rw-r--r-- | net/ipv4/ipmr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 76a7f07b38b6..d2aae278de69 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -1225,7 +1225,7 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsi ret = ip_ra_control(sk, 1, mrtsock_destruct); if (ret == 0) { - RCU_INIT_POINTER(mrt->mroute_sk, sk); + rcu_assign_pointer(mrt->mroute_sk, sk); IPV4_DEVCONF_ALL(net, MC_FORWARDING)++; } rtnl_unlock(); |