pktgen: use vzalloc_node() instead of vmalloc_node() + memset()
authorWANG Cong <xiyou.wangcong@gmail.com>
Sun, 22 May 2011 00:17:11 +0000 (00:17 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 23 May 2011 01:01:21 +0000 (21:01 -0400)
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/pktgen.c

index 67870e9fd097f2ff04edf8d360596ec9e45c9604..3b85c0dffa619c583251c2c0e6bd57607b2baada 100644 (file)
@@ -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;