|
@@ -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);
|
|
|
}
|
|
|
|