Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 195277
b: refs/heads/master
c: 476c609
h: refs/heads/master
i:
  195275: ebf2614
v: v3
  • Loading branch information
Julia Lawall authored and David S. Miller committed May 18, 2010
1 parent 13f72c5 commit a9457ea
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 49afa55b5bd792cda4fca15d3238e9b6f370c856
refs/heads/master: 476c609e6eebe73e6038068b16a22238617b54a4
3 changes: 1 addition & 2 deletions trunk/drivers/net/vmxnet3/vmxnet3_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit a9457ea

Please sign in to comment.