From 2f32989fae6f2f00a97b4aa6ae41bb848d685beb Mon Sep 17 00:00:00 2001 From: Mariusz Kozlowski Date: Fri, 28 Mar 2008 14:41:29 -0700 Subject: [PATCH] --- yaml --- r: 90468 b: refs/heads/master c: 80950f8b71176ae8b6f2a78de039b8bc2da7f480 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/yellowfin.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 541f594291e9..a9bb38ec165f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5af6ad3a0d4f5c6d0a3535d46fc1b26eeff0816 +refs/heads/master: 80950f8b71176ae8b6f2a78de039b8bc2da7f480 diff --git a/trunk/drivers/net/yellowfin.c b/trunk/drivers/net/yellowfin.c index fe6ff3e3d525..24640726f8bb 100644 --- a/trunk/drivers/net/yellowfin.c +++ b/trunk/drivers/net/yellowfin.c @@ -770,14 +770,14 @@ static void yellowfin_init_ring(struct net_device *dev) /* Branch on Tx error. */ yp->tx_ring[j].dbdma_cmd = cpu_to_le32(CMD_STOP); yp->tx_ring[j].branch_addr = cpu_to_le32(yp->tx_ring_dma + - (j+1)*sizeof(struct yellowfin_desc); + (j+1)*sizeof(struct yellowfin_desc)); j++; if (yp->flags & FullTxStatus) { yp->tx_ring[j].dbdma_cmd = cpu_to_le32(CMD_TXSTATUS | sizeof(*yp->tx_status)); yp->tx_ring[j].request_cnt = sizeof(*yp->tx_status); yp->tx_ring[j].addr = cpu_to_le32(yp->tx_status_dma + - i*sizeof(struct tx_status_words); + i*sizeof(struct tx_status_words)); } else { /* Symbios chips write only tx_errs word. */ yp->tx_ring[j].dbdma_cmd =