---

yaml
---
r: 25679
b: refs/heads/master
c: 4be5de2
h: refs/heads/master
i:
  25677: 536b008
  25675: 0999223
  25671: b5f1747
  25663: 82f9aec
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff768cd7139ab368bc2b97e7bd6fa592f20e1950
+refs/heads/master: 4be5de25259de21894df5e2fecc30da8252dee8c

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);