On Wed, Mar 19, 2014 at 04:14:31AM +0530, Monam Agarwal wrote:
> Signed-off-by: Monam Agarwal <monamagarwal...@gmail.com>
Reviewed-by: Paul E. McKenney <paul...@linux.vnet.ibm.com>
> ---
> drivers/net/macvtap.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
> index 1b7082d..7c88d13 100644
> --- a/drivers/net/macvtap.c
> +++ b/drivers/net/macvtap.c
> @@ -145,8 +145,8 @@ static void macvtap_put_queue(struct macvtap_queue *q)
> if (vlan) {
> int index = get_slot(vlan, q);
>
> - rcu_assign_pointer(vlan->taps[index], NULL);
> - rcu_assign_pointer(q->vlan, NULL);
> + RCU_INIT_POINTER(vlan->taps[index], NULL);
> + RCU_INIT_POINTER(q->vlan, NULL);
> sock_put(&q->sk);
> --vlan->numvtaps;
> }
> @@ -223,8 +223,8 @@ static void macvtap_del_queues(struct net_device *dev)
> lockdep_is_held(&macvtap_lock));
> if (q) {
> qlist[j++] = q;
> - rcu_assign_pointer(vlan->taps[i], NULL);
> - rcu_assign_pointer(q->vlan, NULL);
> + RCU_INIT_POINTER(vlan->taps[i], NULL);
> + RCU_INIT_POINTER(q->vlan, NULL);
> vlan->numvtaps--;
> }
> }
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
