Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / net / bridge / br_vlan.c

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index f23c74b3a95327722916405cee92d5d61048c8a2..91510712c7a729df3d57c3f118ece9eb3da3fe20 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -99,9 +99,9 @@ static int __vlan_del(struct net_port_vlans *v, u16 vid)
        v->num_vlans--;
        if (bitmap_empty(v->vlan_bitmap, VLAN_N_VID)) {
                if (v->port_idx)
-                       rcu_assign_pointer(v->parent.port->vlan_info, NULL);
+                       RCU_INIT_POINTER(v->parent.port->vlan_info, NULL);
                else
-                       rcu_assign_pointer(v->parent.br->vlan_info, NULL);
+                       RCU_INIT_POINTER(v->parent.br->vlan_info, NULL);
                kfree_rcu(v, rcu);
        }
        return 0;
@@ -113,9 +113,9 @@ static void __vlan_flush(struct net_port_vlans *v)
        v->pvid = 0;
        bitmap_zero(v->vlan_bitmap, VLAN_N_VID);
        if (v->port_idx)
-               rcu_assign_pointer(v->parent.port->vlan_info, NULL);
+               RCU_INIT_POINTER(v->parent.port->vlan_info, NULL);
        else
-               rcu_assign_pointer(v->parent.br->vlan_info, NULL);
+               RCU_INIT_POINTER(v->parent.br->vlan_info, NULL);
        kfree_rcu(v, rcu);
 }