From 8aec185a62fe88b19c3b271ae1cc5871c8b6577f Mon Sep 17 00:00:00 2001 From: "shemminger@osdl.org" Date: Wed, 26 Oct 2005 12:16:08 -0700 Subject: [PATCH] --- yaml --- r: 15699 b: refs/heads/master c: b2f5ad4fec76e78103e7fbb4e808587ea8a6d824 h: refs/heads/master i: 15697: bcd20d20ec8633dfcd0354c76b7ac439fc07dea6 15695: a4458177f582f61771d7e32bb01b3007906cb749 v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 39ae084695a6..761c02f8d7fd 100644 --- 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 index 06beb71cb3c8..f5b101bf469e 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -910,12 +910,11 @@ 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); @@ -923,7 +922,7 @@ static int sky2_up(struct net_device *dev) 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;