From 85872031a7d0dfbc3843c7bd2f28cc5f86b1523f Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Fri, 16 Nov 2012 10:47:38 +0000 Subject: [PATCH] --- yaml --- r: 338039 b: refs/heads/master c: 1a2bd6b257592cc05e9dd3d36e5810466a075fc3 h: refs/heads/master i: 338037: 6f977d20df30108d03cddee089df39ea0c9b1ae1 338035: fa52b6dbc0aa3e57d844414799a9c6aa369c3ddb 338031: b6105c796ef723f9c03a04f5c40b7ce79637b34a v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et131x.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index db24be7cf566..4bc4cf5f33ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15ffde4d36c30d81cd04a154960608486a1464f4 +refs/heads/master: 1a2bd6b257592cc05e9dd3d36e5810466a075fc3 diff --git a/trunk/drivers/staging/et131x/et131x.c b/trunk/drivers/staging/et131x/et131x.c index 82ed113f444e..c411d13baa26 100644 --- a/trunk/drivers/staging/et131x/et131x.c +++ b/trunk/drivers/staging/et131x/et131x.c @@ -2291,8 +2291,7 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter) for (id = 0; id < NUM_FBRS; id++) { /* Allocate an area of memory for Free Buffer Ring */ - bufsize = (sizeof(struct fbr_desc) * - rx_ring->fbr[id]->num_entries) + 0xfff; + bufsize = (sizeof(struct fbr_desc) * rx_ring->fbr[id]->num_entries); rx_ring->fbr[id]->ring_virtaddr = dma_alloc_coherent(&adapter->pdev->dev, bufsize, @@ -2463,8 +2462,7 @@ static void et131x_rx_dma_memory_free(struct et131x_adapter *adapter) } bufsize = - (sizeof(struct fbr_desc) * rx_ring->fbr[id]->num_entries) + - 0xfff; + sizeof(struct fbr_desc) * rx_ring->fbr[id]->num_entries; dma_free_coherent(&adapter->pdev->dev, bufsize, rx_ring->fbr[id]->ring_virtaddr,