ixgbe: always enable vlan strip/insert when DCB is enabled

[safe/jmp/linux-2.6] / drivers / net / ibmveth.c

diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 941be84..7acb3ed 100644 (file)
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -200,7 +200,7 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)
                return -1;
        }
 
-       pool->skbuff = kmalloc(sizeof(void*) * pool->size, GFP_KERNEL);
+       pool->skbuff = kcalloc(pool->size, sizeof(void *), GFP_KERNEL);
 
        if(!pool->skbuff) {
                kfree(pool->dma_addr);
@@ -211,7 +211,6 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)
                return -1;
        }
 
-       memset(pool->skbuff, 0, sizeof(void*) * pool->size);
        memset(pool->dma_addr, 0, sizeof(dma_addr_t) * pool->size);
 
        for(i = 0; i < pool->size; ++i) {