diff --git a/[refs] b/[refs]
index 6722f70ca9a7..e883a0fb6b11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d70cd51ac0585a9273abea4c333e8f0dd8385d27
+refs/heads/master: 585b56012f08a6edc598d17b28a6c434134bfaff
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 39916e7cf6f9..cdcbf727f884 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -2921,7 +2921,7 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
 	spin_lock_init(&sky2->tx_lock);
 	/* Auto speed and flow control */
 	sky2->autoneg = AUTONEG_ENABLE;
-	sky2->tx_pause = 0;
+	sky2->tx_pause = 1;
 	sky2->rx_pause = 1;
 	sky2->duplex = -1;
 	sky2->speed = -1;