From bd43b42ead99034ba8c29577621ff145a0759fff Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 18 Jun 2013 19:32:38 +0200 Subject: [PATCH] --- yaml --- r: 377417 b: refs/heads/master c: 9fa8e980bb0a56e46ddd97731f83f608c39aa7a5 h: refs/heads/master i: 377415: 5e29c15ee33a6e4439d6cce32ec362e60be5b136 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 28b19cbbff7c..9dc5a2fcd87f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 451bff2932a69e904f41a180145de1d2358bb8f5 +refs/heads/master: 9fa8e980bb0a56e46ddd97731f83f608c39aa7a5 diff --git a/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c b/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c index 2ad1494efbb3..d1cbfb12c1ca 100644 --- a/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -1757,7 +1757,7 @@ static int rxq_init(struct mv643xx_eth_private *mp, int index) memset(rxq->rx_desc_area, 0, size); rxq->rx_desc_area_size = size; - rxq->rx_skb = kmalloc_array(rxq->rx_ring_size, sizeof(*rxq->rx_skb), + rxq->rx_skb = kcalloc(rxq->rx_ring_size, sizeof(*rxq->rx_skb), GFP_KERNEL); if (rxq->rx_skb == NULL) goto out_free;