diff options
| author |   Yan Burman <burman.yan@gmail.com> | 2006-12-14 15:25:00 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2006-12-17 21:59:06 -0800 |
| commit | bd2b334378530f6dbe03f6325b8c885524e298a3 (patch) | |
| tree | c45be1ccd568ac9076a3ce13ddaca1c2e2e0c47d /drivers/net/tg3.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq (diff) | |
| download | linux-dev-bd2b334378530f6dbe03f6325b8c885524e298a3.tar.xz linux-dev-bd2b334378530f6dbe03f6325b8c885524e298a3.zip | |
[TG3]: replace kmalloc+memset with kzalloc
Replace kmalloc+memset with kzalloc
Signed-off-by: Yan Burman <burman.yan@gmail.com>
Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/tg3.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 571320ae87ab..23bad21b5c87 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -4426,7 +4426,7 @@ static void tg3_free_consistent(struct tg3 *tp) */ static int tg3_alloc_consistent(struct tg3 *tp) { - tp->rx_std_buffers = kmalloc((sizeof(struct ring_info) * + tp->rx_std_buffers = kzalloc((sizeof(struct ring_info) * (TG3_RX_RING_SIZE + TG3_RX_JUMBO_RING_SIZE)) + (sizeof(struct tx_ring_info) * @@ -4435,13 +4435,6 @@ static int tg3_alloc_consistent(struct tg3 *tp) if (!tp->rx_std_buffers) return -ENOMEM; - memset(tp->rx_std_buffers, 0, - (sizeof(struct ring_info) * - (TG3_RX_RING_SIZE + - TG3_RX_JUMBO_RING_SIZE)) + - (sizeof(struct tx_ring_info) * - TG3_TX_RING_SIZE)); - tp->rx_jumbo_buffers = &tp->rx_std_buffers[TG3_RX_RING_SIZE]; tp->tx_buffers = (struct tx_ring_info *) &tp->rx_jumbo_buffers[TG3_RX_JUMBO_RING_SIZE]; |