Commit ec4db5af authored by David S. Miller's avatar David S. Miller

Cset exclude: davem@nuts.davemloft.net|ChangeSet|20040817010613|52352

parent d1c7d252
No related merge requests found
......@@ -2865,8 +2865,6 @@ 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);
......@@ -3231,8 +3229,6 @@ 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);
......@@ -6610,9 +6606,6 @@ 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);
......@@ -6651,9 +6644,6 @@ 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);
......@@ -8509,8 +8499,6 @@ 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