2006-12-12 19:12:05

by Yan Burman

Subject: [PATCH 2.6.19] tg3: replace kmalloc+memset with kzalloc

Replace kmalloc+memset with kzalloc

Signed-off-by: Yan Burman <[email protected]>

diff -rubp linux-2.6.19-rc5_orig/drivers/net/tg3.c linux-2.6.19-rc5_kzalloc/drivers/net/tg3.c
--- linux-2.6.19-rc5_orig/drivers/net/tg3.c 2006-11-09 12:16:21.000000000 +0200
+++ linux-2.6.19-rc5_kzalloc/drivers/net/tg3.c 2006-11-11 22:44:18.000000000 +0200
@@ -4416,7 +4416,7 @@ static void tg3_free_consistent(struct t
*/
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) *
@@ -4425,13 +4425,6 @@ static int tg3_alloc_consistent(struct t
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];

2006-12-12 19:41:34

by Michael Chan

Subject: Re: [PATCH 2.6.19] tg3: replace kmalloc+memset with kzalloc

On Tue, 2006-12-12 at 21:10 +0200, Yan Burman wrote:
> Replace kmalloc+memset with kzalloc
>
> Signed-off-by: Yan Burman <[email protected]>

Acked-by: Michael Chan <[email protected]>

2006-12-14 23:25:30

by David Miller

Subject: Re: [PATCH 2.6.19] tg3: replace kmalloc+memset with kzalloc

From: "Michael Chan" <[email protected]>
Date: Tue, 12 Dec 2006 12:30:28 -0800

> On Tue, 2006-12-12 at 21:10 +0200, Yan Burman wrote:
> > Replace kmalloc+memset with kzalloc
> >
> > Signed-off-by: Yan Burman <[email protected]>
>
> Acked-by: Michael Chan <[email protected]>

Applied, thanks everyone.