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

Commit 844b3eed authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Refine tg3_vlan_rx_register() 



tg3_vlan_rx_register() touches the hardware if netif_running() returns
false.  This patch fixes the problem.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarBenjamin Li <benli@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e5856bd

drivers/net/tg3.c

+7 −4
Original line number Diff line number Diff line
@@ -9896,7 +9896,11 @@ static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) 
{

	struct tg3 *tp = netdev_priv(dev);



	if (netif_running(dev))

	if (!netif_running(dev)) {

		tp->vlgrp = grp;

		return;

	}



	tg3_netif_stop(tp);



	tg3_full_lock(tp, 0);
@@ -9906,7 +9910,6 @@ static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) 
	/* Update RX_MODE_KEEP_VLAN_TAG bit in RX_MODE register. */

	__tg3_set_rx_mode(dev);



	if (netif_running(dev))

	tg3_netif_start(tp);



	tg3_full_unlock(tp);