---

yaml --- r: 247972 b: refs/heads/master c: 68d5ac2 h: refs/heads/master v: v3
git-mirror · May 23, 2011 · 7348c9d · 7348c9d
1 parent 6b9db5f
commit 7348c9d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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;