From dc2ac62da99712b8f3d7ecf0fbf9904e143869e1 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 14 Oct 2015 11:24:38 +0200 Subject: trafgen: Move checking of dynamic packet elements to header Move has_dynamic_elems() to to trafgen_conf.h, rename it to packet_dyn_has_elems() and use it to check whether dynamic packet elements are present. Also change the return type to bool and use || instead of + to potentially make use of short-circuit evaluation. Signed-off-by: Tobias Klauser --- trafgen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'trafgen.c') diff --git a/trafgen.c b/trafgen.c index 800ba02..16a078c 100644 --- a/trafgen.c +++ b/trafgen.c @@ -543,7 +543,7 @@ static void xmit_slowpath_or_die(struct ctx *ctx, unsigned int cpu, unsigned lon while (likely(sigint == 0 && num > 0 && plen > 0)) { pktd = &packet_dyn[i]; - if (pktd->clen + pktd->rlen + pktd->slen) { + if (packet_dyn_has_elems(pktd)) { apply_counter(i); apply_randomizer(i); apply_csum16(i); @@ -651,7 +651,7 @@ static void xmit_fastpath_or_die(struct ctx *ctx, unsigned int cpu, unsigned lon hdr->tp_h.tp_len = packets[i].len; pktd = &packet_dyn[i]; - if (pktd->clen + pktd->rlen + pktd->slen) { + if (packet_dyn_has_elems(pktd)) { apply_counter(i); apply_randomizer(i); apply_csum16(i); -- cgit v1.2.3-54-g00ecf