diff --git a/[refs] b/[refs] index 2308ba531aaf..feaa5f72a937 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93aea718c69d44ee492f233929686b15b5b3702d +refs/heads/master: ff7907aede7962629c2eb50e08b870316c80518f diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index 381669cc415f..5ece10034df9 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/drivers/net/skge.c @@ -733,13 +733,12 @@ static int skge_ring_alloc(struct skge_ring *ring, void *vaddr, u32 base) struct skge_element *e; int i; - ring->start = kmalloc(sizeof(*e)*ring->count, GFP_KERNEL); + ring->start = kcalloc(sizeof(*e), ring->count, GFP_KERNEL); if (!ring->start) return -ENOMEM; for (i = 0, e = ring->start, d = vaddr; i < ring->count; i++, e++, d++) { e->desc = d; - e->skb = NULL; if (i == ring->count - 1) { e->next = ring->start; d->next_offset = base;