From e51c8535813f7485d0c5294d25225e07e2136771 Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Fri, 16 Nov 2012 10:47:40 +0000 Subject: [PATCH] --- yaml --- r: 338041 b: refs/heads/master c: 9967bd4842b39eaf632f77028fdd798775fd9686 h: refs/heads/master i: 338039: 85872031a7d0dfbc3843c7bd2f28cc5f86b1523f v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et131x.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 845104f0c0cd..a5624c4eaa85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 823bb2e8e1df99a28977f212975562b30f8dfd5e +refs/heads/master: 9967bd4842b39eaf632f77028fdd798775fd9686 diff --git a/trunk/drivers/staging/et131x/et131x.c b/trunk/drivers/staging/et131x/et131x.c index 9ccd9b7f2fbe..703a874996aa 100644 --- a/trunk/drivers/staging/et131x/et131x.c +++ b/trunk/drivers/staging/et131x/et131x.c @@ -2310,13 +2310,6 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter) for (i = 0; i < (rx_ring->fbr[id]->num_entries / FBR_CHUNKS); i++) { dma_addr_t fbr_tmp_physaddr; - /* This code allocates an area of memory big enough for - * N free buffers + (buffer_size - 1) so that the - * buffers can be aligned on 4k boundaries. If each - * buffer were aligned to a buffer_size boundary, the - * effect would be to double the size of FBR0. By - * allocating N buffers at once, we reduce this overhead - */ rx_ring->fbr[id]->mem_virtaddrs[i] = dma_alloc_coherent( &adapter->pdev->dev, fbr_chunksize, &rx_ring->fbr[id]->mem_physaddrs[i], @@ -2901,9 +2894,6 @@ static int et131x_tx_dma_memory_alloc(struct et131x_adapter *adapter) return -ENOMEM; } - /* Allocate enough memory for the Tx descriptor ring, and allocate - * some extra so that the ring can be aligned on a 4k boundary. - */ desc_size = (sizeof(struct tx_desc) * NUM_DESC_PER_RING_TX); tx_ring->tx_desc_ring = (struct tx_desc *) dma_alloc_coherent(&adapter->pdev->dev,