Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29315e87 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[TG3]: Add tg3_netif_stop() in vlan functions 



Add tg3_netif_stop() when changing the vlgrp (vlan group) pointer. It
is necessary to quiesce the device before changing that pointer.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3820c3f3

drivers/net/tg3.c

+12 −0
Original line number Diff line number Diff line
@@ -8738,6 +8738,9 @@ static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) 
{

	struct tg3 *tp = netdev_priv(dev);



	if (netif_running(dev))

		tg3_netif_stop(tp);



	tg3_full_lock(tp, 0);



	tp->vlgrp = grp;
@@ -8746,16 +8749,25 @@ static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) 
	__tg3_set_rx_mode(dev);



	tg3_full_unlock(tp);



	if (netif_running(dev))

		tg3_netif_start(tp);

}



static void tg3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)

{

	struct tg3 *tp = netdev_priv(dev);



	if (netif_running(dev))

		tg3_netif_stop(tp);



	tg3_full_lock(tp, 0);

	if (tp->vlgrp)

		tp->vlgrp->vlan_devices[vid] = NULL;

	tg3_full_unlock(tp);



	if (netif_running(dev))

		tg3_netif_start(tp);

}

#endif