From 34ea4326efd94c5bb862204720a87660c9d106fd Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 5 Nov 2009 21:04:32 -0800 Subject: [PATCH] --- yaml --- r: 171183 b: refs/heads/master c: baac8564547ac7f944af1c2e8cc6fdd57f2836a4 h: refs/heads/master i: 171181: 5e67ad8b69d10f9796b069082502dab4a9af6b60 171179: f11c16948cf0360db251ac5a166a0494ec76976e 171175: a4f62b03e64709a8898485c87764539139fcedc9 171167: 68dd5c58b42fdb3d61d1b194d8d45e97d9ace2a6 v: v3 --- [refs] | 2 +- trunk/net/core/pktgen.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 003be13c087f..a0b7872ad539 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf8e56bfc4fcfcef9f08e6233dc619706807893a +refs/heads/master: baac8564547ac7f944af1c2e8cc6fdd57f2836a4 diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c index 5ce017bf4afa..d38470a32792 100644 --- a/trunk/net/core/pktgen.c +++ b/trunk/net/core/pktgen.c @@ -340,6 +340,7 @@ struct pktgen_dev { __u16 cur_udp_src; __u16 cur_queue_map; __u32 cur_pkt_size; + __u32 last_pkt_size; __u8 hh[14]; /* = { @@ -3434,7 +3435,7 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev) pkt_dev->clone_count--; /* back out increment, OOM */ return; } - + pkt_dev->last_pkt_size = pkt_dev->skb->len; pkt_dev->allocated_skbs++; pkt_dev->clone_count = 0; /* reset counter */ } @@ -3461,7 +3462,7 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev) pkt_dev->last_ok = 1; pkt_dev->sofar++; pkt_dev->seq_num++; - pkt_dev->tx_bytes += pkt_dev->cur_pkt_size; + pkt_dev->tx_bytes += pkt_dev->last_pkt_size; break; default: /* Drivers are not supposed to return other values! */ if (net_ratelimit())