diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-01-12 04:41:32 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-12 12:26:56 -0800 |
commit | cf778b00e96df6d64f8e21b8395d1f8a859ecdc7 (patch) | |
tree | 4cc157d564bd65d687bdf722af3202e9e277ea98 /net/ipv4/devinet.c | |
parent | 9ee6045f09a7875ebe55b9942b232a19076b157b (diff) | |
download | kernel_goldelico_gta04-cf778b00e96df6d64f8e21b8395d1f8a859ecdc7.zip kernel_goldelico_gta04-cf778b00e96df6d64f8e21b8395d1f8a859ecdc7.tar.gz kernel_goldelico_gta04-cf778b00e96df6d64f8e21b8395d1f8a859ecdc7.tar.bz2 |
net: reintroduce missing rcu_assign_pointer() calls
commit a9b3cd7f32 (rcu: convert uses of rcu_assign_pointer(x, NULL) to
RCU_INIT_POINTER) did a lot of incorrect changes, since it did a
complete conversion of rcu_assign_pointer(x, y) to RCU_INIT_POINTER(x,
y).
We miss needed barriers, even on x86, when y is not NULL.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Stephen Hemminger <shemminger@vyatta.com>
CC: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/devinet.c')
-rw-r--r-- | net/ipv4/devinet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 65f01dc..e41c40f 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -258,7 +258,7 @@ static struct in_device *inetdev_init(struct net_device *dev) ip_mc_up(in_dev); /* we can receive as soon as ip_ptr is set -- do this last */ - RCU_INIT_POINTER(dev->ip_ptr, in_dev); + rcu_assign_pointer(dev->ip_ptr, in_dev); out: return in_dev; out_kfree: |