diff options
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 3a43426ced32..314f5cfe7246 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -3512,9 +3512,9 @@ static inline int tg3_irq_sync(struct tg3 *tp) | |||
3512 | */ | 3512 | */ |
3513 | static inline void tg3_full_lock(struct tg3 *tp, int irq_sync) | 3513 | static inline void tg3_full_lock(struct tg3 *tp, int irq_sync) |
3514 | { | 3514 | { |
3515 | spin_lock_bh(&tp->lock); | ||
3515 | if (irq_sync) | 3516 | if (irq_sync) |
3516 | tg3_irq_quiesce(tp); | 3517 | tg3_irq_quiesce(tp); |
3517 | spin_lock_bh(&tp->lock); | ||
3518 | } | 3518 | } |
3519 | 3519 | ||
3520 | static inline void tg3_full_unlock(struct tg3 *tp) | 3520 | static inline void tg3_full_unlock(struct tg3 *tp) |
@@ -9116,10 +9116,10 @@ static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) | |||
9116 | /* Update RX_MODE_KEEP_VLAN_TAG bit in RX_MODE register. */ | 9116 | /* Update RX_MODE_KEEP_VLAN_TAG bit in RX_MODE register. */ |
9117 | __tg3_set_rx_mode(dev); | 9117 | __tg3_set_rx_mode(dev); |
9118 | 9118 | ||
9119 | tg3_full_unlock(tp); | ||
9120 | |||
9121 | if (netif_running(dev)) | 9119 | if (netif_running(dev)) |
9122 | tg3_netif_start(tp); | 9120 | tg3_netif_start(tp); |
9121 | |||
9122 | tg3_full_unlock(tp); | ||
9123 | } | 9123 | } |
9124 | #endif | 9124 | #endif |
9125 | 9125 | ||