From 8904daae6daa72dfbe3fea3284fe5afddc2ced65 Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@hellgate.ch>
Date: Tue, 4 Apr 2006 20:49:16 +0200
Subject: [PATCH] --- yaml --- r: 25679 b: refs/heads/master c:
 4be5de25259de21894df5e2fecc30da8252dee8c h: refs/heads/master i:   25677:
 536b008991a1f84812f33237ea3cffe1bc56c41b   25675:
 099922366e17f6a537e683b4b8486677892fa26b   25671:
 b5f17474ee59558a56ca381d5984920306f13036   25663:
 82f9aecc2f8887d02f8e44231a61f8fcad190395 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/net/via-rhine.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 68c374dc35a1..4a599e350ce0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff768cd7139ab368bc2b97e7bd6fa592f20e1950
+refs/heads/master: 4be5de25259de21894df5e2fecc30da8252dee8c
diff --git a/trunk/drivers/net/via-rhine.c b/trunk/drivers/net/via-rhine.c
index a9b2150909d6..53dfc8c7525b 100644
--- a/trunk/drivers/net/via-rhine.c
+++ b/trunk/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);