evaluate: simplify calculation of payload size.

Use div_round_up and one statement.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/src/evaluate.c b/src/evaluate.c
index fda30fd8001efd5b32df2f27643105afde9653b1..e2eff23536576dea3176a8268374fdb0a6ae09cc 100644 (file)
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -2236,8 +2236,8 @@ static int stmt_evaluate_payload(struct eval_ctx *ctx, struct stmt *stmt)
 
        shift_imm = expr_offset_shift(payload, payload->payload.offset,
                                      &extra_len);
-       payload_byte_size = round_up(payload->len, BITS_PER_BYTE) / BITS_PER_BYTE;
-       payload_byte_size += (extra_len / BITS_PER_BYTE);
+       payload_byte_size = div_round_up(payload->len + extra_len,
+                                        BITS_PER_BYTE);
 
        if (need_csum && payload_byte_size & 1) {
                payload_byte_size++;