From 0450fd1d25b81e12908dfdac1819a571f10a8ee7 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Thu, 12 Sep 2013 18:38:50 +0200 Subject: trafgen: combine likely conditions Combine multiple likely conditions into one. Signed-off-by: Daniel Borkmann --- trafgen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'trafgen.c') diff --git a/trafgen.c b/trafgen.c index e140479..5150a91 100644 --- a/trafgen.c +++ b/trafgen.c @@ -547,7 +547,7 @@ static void xmit_slowpath_or_die(struct ctx *ctx, int cpu, unsigned long orig_nu bug_on(gettimeofday(&start, NULL)); - while (likely(sigint == 0) && likely(num > 0) && likely(plen > 0)) { + while (likely(sigint == 0 && num > 0 && plen > 0)) { pktd = &packet_dyn[i]; if (pktd->clen + pktd->rlen + pktd->slen) { apply_counter(i); @@ -649,7 +649,7 @@ static void xmit_fastpath_or_die(struct ctx *ctx, int cpu, unsigned long orig_nu bug_on(gettimeofday(&start, NULL)); - while (likely(sigint == 0) && likely(num > 0) && likely(plen > 0)) { + while (likely(sigint == 0 && num > 0 && plen > 0)) { while (user_may_pull_from_tx(tx_ring.frames[it].iov_base) && likely(num > 0)) { hdr = tx_ring.frames[it].iov_base; out = ((uint8_t *) hdr) + TPACKET2_HDRLEN - sizeof(struct sockaddr_ll); -- cgit v1.2.3-54-g00ecf