From 1041830f220c8746218b7382da43234dd3dcfa7e Mon Sep 17 00:00:00 2001 From: Junchang Wang Date: Sun, 7 Nov 2010 23:19:43 +0000 Subject: [PATCH] --- yaml --- r: 221997 b: refs/heads/master c: eb589063ed482f5592b1378e4136d6998419af6e h: refs/heads/master i: 221995: 7b89a8297c0005172ede36d8d6d8fcd651315aeb v: v3 --- [refs] | 2 +- trunk/net/core/pktgen.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b8568c395aa1..1dee0c54bba1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18543a643fae694982c7d89c22436885f3506497 +refs/heads/master: eb589063ed482f5592b1378e4136d6998419af6e diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c index 1992cd050e26..33bc3823ac6f 100644 --- a/trunk/net/core/pktgen.c +++ b/trunk/net/core/pktgen.c @@ -2612,8 +2612,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; @@ -2976,8 +2976,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