Commit 9dfef3da authored by David S. Miller's avatar David S. Miller

[TG3]: Do not forget to re-enable interrupts on tg3_init_hw() code paths.

This broke MTU changing, among other things.
Signed-off-by: default avatarDavid S. Miller <davem@redhat.com>
parent fb03715e
......@@ -2885,6 +2885,8 @@ static void tg3_reset_task(void *_data)
tg3_halt(tp);
tg3_init_hw(tp);
tg3_enable_ints(tp);
spin_unlock(&tp->tx_lock);
spin_unlock_irq(&tp->lock);
......@@ -3249,6 +3251,8 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)
tg3_init_hw(tp);
tg3_enable_ints(tp);
spin_unlock(&tp->tx_lock);
spin_unlock_irq(&tp->lock);
tg3_netif_start(tp);
......@@ -6626,6 +6630,9 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e
tg3_halt(tp);
tg3_init_hw(tp);
tg3_enable_ints(tp);
netif_wake_queue(tp->dev);
spin_unlock(&tp->tx_lock);
spin_unlock_irq(&tp->lock);
......@@ -6664,6 +6671,9 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
tp->tg3_flags &= ~TG3_FLAG_PAUSE_TX;
tg3_halt(tp);
tg3_init_hw(tp);
tg3_enable_ints(tp);
spin_unlock(&tp->tx_lock);
spin_unlock_irq(&tp->lock);
tg3_netif_start(tp);
......@@ -8519,6 +8529,8 @@ static int tg3_suspend(struct pci_dev *pdev, u32 state)
tp->timer.expires = jiffies + tp->timer_offset;
add_timer(&tp->timer);
tg3_enable_ints(tp);
spin_unlock(&tp->tx_lock);
spin_unlock_irq(&tp->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment