---

yaml --- r: 15699 b: refs/heads/master c: b2f5ad4 h: refs/heads/master i: 15697: bcd20d2 15695: a445817 v: v3
git-mirror · Oct 28, 2005 · 8aec185 · 8aec185
1 parent b0075a8
commit 8aec185
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 488f84fd901cd3386f5723a3573ea2e1f55af537
+refs/heads/master: b2f5ad4fec76e78103e7fbb4e808587ea8a6d824
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -910,20 +910,19 @@ static int sky2_up(struct net_device *dev)
 	if (!sky2->tx_le)
 		goto err_out;
 
-	sky2->tx_ring = kmalloc(TX_RING_SIZE * sizeof(struct ring_info),
+	sky2->tx_ring = kzalloc(TX_RING_SIZE * sizeof(struct ring_info),
 				GFP_KERNEL);
 	if (!sky2->tx_ring)
 		goto err_out;
 	sky2->tx_prod = sky2->tx_cons = 0;
-	memset(sky2->tx_ring, 0, TX_RING_SIZE * sizeof(struct ring_info));
 
 	sky2->rx_le = pci_alloc_consistent(hw->pdev, RX_LE_BYTES,
 					   &sky2->rx_le_map);
 	if (!sky2->rx_le)
 		goto err_out;
 	memset(sky2->rx_le, 0, RX_LE_BYTES);
 
-	sky2->rx_ring = kmalloc(sky2->rx_pending * sizeof(struct ring_info),
+	sky2->rx_ring = kzalloc(sky2->rx_pending * sizeof(struct ring_info),
 				GFP_KERNEL);
 	if (!sky2->rx_ring)
 		goto err_out;