From 9b8d3142a639a40ccc709c159158c9b91da65cad Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Wed, 25 Feb 2009 14:23:56 +0000 Subject: [PATCH] --- yaml --- r: 134781 b: refs/heads/master c: 844b3eed8a9efffa4225c811b989c8ff41691a78 h: refs/heads/master i: 134779: 8b8300bf0ae050d7dea1ce9cfe9990702a9976a4 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 04f691004bbe..8a3811cf2fab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e5856bd9644e2299adbf5d0a8916f9cc56f1f36 +refs/heads/master: 844b3eed8a9efffa4225c811b989c8ff41691a78 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 0ea61f7f6203..ce29097cc759 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -9896,8 +9896,12 @@ 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); + if (!netif_running(dev)) { + tp->vlgrp = grp; + return; + } + + tg3_netif_stop(tp); tg3_full_lock(tp, 0); @@ -9906,8 +9910,7 @@ 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_netif_start(tp); tg3_full_unlock(tp); }