diff --git a/[refs] b/[refs]
index fa7581868e3e..97e1abf80b0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e5f1283a2aed429f4457e2eb875b1928a6643df
+refs/heads/master: f55925d7eb04f936ab4c001f10e3e9c74c1297ae
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 552aca76b283..4bb6ea13efdd 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -1927,7 +1927,8 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do)
 
 		case OP_TXINDEXLE:
 			/* TX index reports status for both ports */
-			sky2_tx_done(hw->dev[0], status & 0xffff);
+			BUILD_BUG_ON(TX_RING_SIZE > 0x1000);
+			sky2_tx_done(hw->dev[0], status & 0xfff);
 			if (hw->dev[1])
 				sky2_tx_done(hw->dev[1],
 				     ((status >> 24) & 0xff)