From d5fa7cd38fc2423d80e541cb9761dc89b8d95332 Mon Sep 17 00:00:00 2001 From: Mariusz Kozlowski Date: Tue, 31 Jul 2007 23:58:36 +0200 Subject: [PATCH] --- yaml --- r: 66509 b: refs/heads/master c: c477f3348abb5f6fb8b627cfdb1d7ae4b8fe613b h: refs/heads/master i: 66507: b8ee6e06b0814c89e005c2abcfccf7571a739bab v: v3 --- [refs] | 2 +- trunk/drivers/net/sb1250-mac.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2c50fc8131fc..18a2d722a693 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a967b14035c5efe4c92623dde3776ffc7a79118c +refs/heads/master: c477f3348abb5f6fb8b627cfdb1d7ae4b8fe613b diff --git a/trunk/drivers/net/sb1250-mac.c b/trunk/drivers/net/sb1250-mac.c index 53845ebb649f..b6cafac97200 100644 --- a/trunk/drivers/net/sb1250-mac.c +++ b/trunk/drivers/net/sb1250-mac.c @@ -780,10 +780,8 @@ static void sbdma_initctx(sbmacdma_t *d, * And context table */ - d->sbdma_ctxtable = (struct sk_buff **) - kmalloc(d->sbdma_maxdescr*sizeof(struct sk_buff *), GFP_KERNEL); - - memset(d->sbdma_ctxtable,0,d->sbdma_maxdescr*sizeof(struct sk_buff *)); + d->sbdma_ctxtable = kcalloc(d->sbdma_maxdescr, + sizeof(struct sk_buff *), GFP_KERNEL); #ifdef CONFIG_SBMAC_COALESCE /*