From 7348c9db4401d1c79d441746147ae2ffe5bf6e7f Mon Sep 17 00:00:00 2001 From: WANG Cong Date: Sun, 22 May 2011 00:17:11 +0000 Subject: [PATCH] --- yaml --- r: 247972 b: refs/heads/master c: 68d5ac2ed6180567407e4187e206df3ba6466373 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/pktgen.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d5d3b8cf9437..c554bca6ca74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4264f27e83968ddfe3f0cfe7a33adfb320e1e42 +refs/heads/master: 68d5ac2ed6180567407e4187e206df3ba6466373 diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c index 67870e9fd097..3b85c0dffa61 100644 --- a/trunk/net/core/pktgen.c +++ b/trunk/net/core/pktgen.c @@ -3544,13 +3544,12 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname) return -ENOMEM; strcpy(pkt_dev->odevname, ifname); - pkt_dev->flows = vmalloc_node(MAX_CFLOWS * sizeof(struct flow_state), + pkt_dev->flows = vzalloc_node(MAX_CFLOWS * sizeof(struct flow_state), node); if (pkt_dev->flows == NULL) { kfree(pkt_dev); return -ENOMEM; } - memset(pkt_dev->flows, 0, MAX_CFLOWS * sizeof(struct flow_state)); pkt_dev->removal_mark = 0; pkt_dev->min_pkt_size = ETH_ZLEN;