The patch titled
via-rhine: execute bounce buffers code on Rhine-I only
has been removed from the -mm tree. Its filename is
via-rhine-execute-bounce-buffers-code-on-rhine-i-only.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Roger Luethi <rl@xxxxxxxxxxx>
Patch suggested by Yang Wu (pin xue <pinxue@xxxxxxxxx>).
Signed-off-by: Roger Luethi <rl@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/via-rhine.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff -puN drivers/net/via-rhine.c~via-rhine-execute-bounce-buffers-code-on-rhine-i-only drivers/net/via-rhine.c
--- devel/drivers/net/via-rhine.c~via-rhine-execute-bounce-buffers-code-on-rhine-i-only 2006-04-10 23:21:26.000000000 -0700
+++ devel-akpm/drivers/net/via-rhine.c 2006-04-10 23:21:26.000000000 -0700
@@ -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_devic
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);
_
Patches currently in -mm which might be from rl@xxxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
