Message ID | 20101108091941.GB5025@Desktop-Junchang |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Junchang Wang <junchangwang@gmail.com> Date: Mon, 8 Nov 2010 17:19:43 +0800 > > This fix a bug reported by backyes. > Right the first time pktgen's using queue_map that's not been initialized > by set_cur_queue_map(pkt_dev); > > Signed-off-by: Junchang Wang <junchangwang@gmail.com> > Signed-off-by: Backyes <backyes@mail.ustc.edu.cn> Applied, thank you. I think I added this bug :-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 2c0df0f..564d9ba 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -2611,8 +2611,8 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev, /* Update any of the values, used when we're incrementing various * fields. */ - queue_map = pkt_dev->cur_queue_map; mod_cur_headers(pkt_dev); + queue_map = pkt_dev->cur_queue_map; datalen = (odev->hard_header_len + 16) & ~0xf; @@ -2975,8 +2975,8 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev, /* Update any of the values, used when we're incrementing various * fields. */ - queue_map = pkt_dev->cur_queue_map; mod_cur_headers(pkt_dev); + queue_map = pkt_dev->cur_queue_map; skb = __netdev_alloc_skb(odev, pkt_dev->cur_pkt_size + 64