---

yaml --- r: 338039 b: refs/heads/master c: 1a2bd6b h: refs/heads/master i: 338037: 6f977d2 338035: fa52b6d 338031: b6105c7 v: v3
git-mirror · Nov 21, 2012 · 8587203 · 8587203
1 parent fef8f2e
commit 8587203
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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,