---

yaml --- r: 195083 b: refs/heads/master c: df01093 h: refs/heads/master i: 195081: dd615fe 195079: 2ee7deb v: v3
git-mirror · May 14, 2010 · 1d70e14 · 1d70e14
1 parent 2516bbf
commit 1d70e14
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37652522faa0877dc6d0dbb6b999bdccc07f0e89
+refs/heads/master: df01093bb08916f434ebedde4610805d4105d05f
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -2275,8 +2275,8 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
 	sky2_write32(hw, B0_IMSK, 0);
 
 	dev->trans_start = jiffies;	/* prevent tx timeout */
-	netif_stop_queue(dev);
 	napi_disable(&hw->napi);
+	netif_tx_disable(dev);
 
 	synchronize_irq(hw->pdev->irq);