---

yaml --- r: 44377 b: refs/heads/master c: c48e3fc h: refs/heads/master i: 44375: e2d65ad v: v3
git-mirror · Dec 12, 2006 · da094e1 · da094e1
1 parent 4c478df
commit da094e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0268bd0a807fc5cc41ced9cce95efe1b43e8fa52
+refs/heads/master: c48e3fca3f063edb0c8c4d163e880b94c1d9f93d
diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c
@@ -1930,9 +1930,8 @@ static int e100_rx_alloc_list(struct nic *nic)
 	nic->rx_to_use = nic->rx_to_clean = NULL;
 	nic->ru_running = RU_UNINITIALIZED;
 
-	if(!(nic->rxs = kmalloc(sizeof(struct rx) * count, GFP_ATOMIC)))
+	if(!(nic->rxs = kcalloc(count, sizeof(struct rx), GFP_ATOMIC)))
 		return -ENOMEM;
-	memset(nic->rxs, 0, sizeof(struct rx) * count);
 
 	for(rx = nic->rxs, i = 0; i < count; rx++, i++) {
 		rx->next = (i + 1 < count) ? rx + 1 : nic->rxs;