From a9457eae948e69424f490fc453a9e629094c1b27 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Thu, 13 May 2010 10:05:40 +0000 Subject: [PATCH] --- yaml --- r: 195277 b: refs/heads/master c: 476c609e6eebe73e6038068b16a22238617b54a4 h: refs/heads/master i: 195275: ebf2614bf6d6fd2fe174c659a50746b89cbc9487 v: v3 --- [refs] | 2 +- trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6dd9a449f70e..4fb531dd42d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49afa55b5bd792cda4fca15d3238e9b6f370c856 +refs/heads/master: 476c609e6eebe73e6038068b16a22238617b54a4 diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c index 39462321f5fb..989b742551ac 100644 --- a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c @@ -1369,13 +1369,12 @@ vmxnet3_rq_create(struct vmxnet3_rx_queue *rq, struct vmxnet3_adapter *adapter) sz = sizeof(struct vmxnet3_rx_buf_info) * (rq->rx_ring[0].size + rq->rx_ring[1].size); - bi = kmalloc(sz, GFP_KERNEL); + bi = kzalloc(sz, GFP_KERNEL); if (!bi) { printk(KERN_ERR "%s: failed to allocate rx bufinfo\n", adapter->netdev->name); goto err; } - memset(bi, 0, sz); rq->buf_info[0] = bi; rq->buf_info[1] = bi + rq->rx_ring[0].size;