From: Roger Luethi Date: Tue, 4 Apr 2006 18:49:16 +0000 (+0200) Subject: [PATCH] via-rhine: execute bounce buffers code on Rhine-I only X-Git-Tag: v2.6.17-rc2~81^2~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4be5de25259de21894df5e2fecc30da8252dee8c;p=platform%2Fupstream%2Fkernel-adaptation-pc.git [PATCH] via-rhine: execute bounce buffers code on Rhine-I only Patch suggested by Yang Wu (pin xue ). Signed-off-by: Roger Luethi Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index a9b2150..53dfc8c 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c @@ -469,7 +469,7 @@ struct rhine_private { struct sk_buff *tx_skbuff[TX_RING_SIZE]; dma_addr_t tx_skbuff_dma[TX_RING_SIZE]; - /* Tx bounce buffers */ + /* Tx bounce buffers (Rhine-I only) */ unsigned char *tx_buf[TX_RING_SIZE]; unsigned char *tx_bufs; dma_addr_t tx_bufs_dma; @@ -1043,7 +1043,8 @@ static void alloc_tbufs(struct net_device* dev) rp->tx_ring[i].desc_length = cpu_to_le32(TXDESC); next += sizeof(struct tx_desc); rp->tx_ring[i].next_desc = cpu_to_le32(next); - rp->tx_buf[i] = &rp->tx_bufs[i * PKT_BUF_SZ]; + if (rp->quirks & rqRhineI) + rp->tx_buf[i] = &rp->tx_bufs[i * PKT_BUF_SZ]; } rp->tx_ring[i-1].next_desc = cpu_to_le32(rp->tx_ring_dma);