From f95e54b2fea8bccef88980e549688acd1e12178a Mon Sep 17 00:00:00 2001 From: Roger Oksanen Date: Fri, 18 Dec 2009 20:18:21 -0800 Subject: [PATCH] --- yaml --- r: 178132 b: refs/heads/master c: 70abc8cb90e679d8519721e2761d8366a18212a6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e100.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fec86a900a9f..971537e9e310 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ee6f6a17cfde9c3141e4d57cf88b5cdf638b463 +refs/heads/master: 70abc8cb90e679d8519721e2761d8366a18212a6 diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c index 929701ca07d3..839fb2b136d3 100644 --- a/trunk/drivers/net/e100.c +++ b/trunk/drivers/net/e100.c @@ -1829,6 +1829,7 @@ static int e100_alloc_cbs(struct nic *nic) &nic->cbs_dma_addr); if (!nic->cbs) return -ENOMEM; + memset(nic->cbs, 0, count * sizeof(struct cb)); for (cb = nic->cbs, i = 0; i < count; cb++, i++) { cb->next = (i + 1 < count) ? cb + 1 : nic->cbs; @@ -1837,7 +1838,6 @@ static int e100_alloc_cbs(struct nic *nic) cb->dma_addr = nic->cbs_dma_addr + i * sizeof(struct cb); cb->link = cpu_to_le32(nic->cbs_dma_addr + ((i+1) % count) * sizeof(struct cb)); - cb->skb = NULL; } nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = nic->cbs;