From a2f403f12ebbcdd7913652e76d845c28961fe569 Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Thu, 1 Nov 2012 22:56:42 +0000 Subject: [PATCH] --- yaml --- r: 337621 b: refs/heads/master c: 4ab07c96d2f1a98ef8561bad61c92ffc2652cbda h: refs/heads/master i: 337619: 1edb50766fb0da16febd78f4a5c46241b7165bda v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et131x.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 1b1b4a699dc9..44cab7cff6b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60eebfad7a2191176fd8af323c1fc6821c8cd61a +refs/heads/master: 4ab07c96d2f1a98ef8561bad61c92ffc2652cbda diff --git a/trunk/drivers/staging/et131x/et131x.c b/trunk/drivers/staging/et131x/et131x.c index 1534582eedc4..d1f519267f54 100644 --- a/trunk/drivers/staging/et131x/et131x.c +++ b/trunk/drivers/staging/et131x/et131x.c @@ -284,8 +284,6 @@ struct rx_status_block { */ struct fbr_lookup { void *virt[MAX_DESC_PER_RING_RX]; - void *buffer1[MAX_DESC_PER_RING_RX]; - void *buffer2[MAX_DESC_PER_RING_RX]; u32 bus_high[MAX_DESC_PER_RING_RX]; u32 bus_low[MAX_DESC_PER_RING_RX]; void *ring_virtaddr; @@ -2405,11 +2403,6 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter) lower_32_bits(fbr_tmp_physaddr); fbr_tmp_physaddr += rx_ring->fbr[id]->buffsize; - - rx_ring->fbr[id]->buffer1[index] = - rx_ring->fbr[id]->virt[index]; - rx_ring->fbr[id]->buffer2[index] = - rx_ring->fbr[id]->virt[index] - 4; } } }