diff options
| author |   Stephen Hemminger <shemminger@osdl.org> | 2006-05-08 15:11:28 -0700 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@osdl.org> | 2006-05-08 16:00:25 -0700 |
| commit | f55925d7eb04f936ab4c001f10e3e9c74c1297ae (patch) | |
| tree | eeb9c38a4a99f92ec1f69c92eba89ea133a779cf /drivers | |
| parent | sky2: status irq hang fix (diff) | |
| download | linux-dev-f55925d7eb04f936ab4c001f10e3e9c74c1297ae.tar.xz linux-dev-f55925d7eb04f936ab4c001f10e3e9c74c1297ae.zip | |
sky2: tx ring index mask fix
Mask for transmit ring status was picking up bits from the
unused sync ring. They were always zero, so far...
Also, make sure to remind self not to make tx ring too big.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sky2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 552aca76b283..4bb6ea13efdd 100644 --- a/drivers/net/sky2.c +++ b/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) |