selftests/bpf: Define local variables at the beginning of a block

Use C89 rules for variable definition.

Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20210122154725.22140-10-bjorn.topel@gmail.com

diff --git a/tools/testing/selftests/bpf/xdpxceiver.c b/tools/testing/selftests/bpf/xdpxceiver.c
index 993ce9b..34bdcae 100644 (file)
--- a/tools/testing/selftests/bpf/xdpxceiver.c
+++ b/tools/testing/selftests/bpf/xdpxceiver.c
@@ -567,9 +567,11 @@ static void rx_pkt(struct xsk_socket_info *xsk, struct pollfd *fds)
        }
 
        for (i = 0; i < rcvd; i++) {
-               u64 addr = xsk_ring_cons__rx_desc(&xsk->rx, idx_rx)->addr;
-               (void)xsk_ring_cons__rx_desc(&xsk->rx, idx_rx++)->len;
-               u64 orig = xsk_umem__extract_addr(addr);
+               u64 addr, orig;
+
+               addr = xsk_ring_cons__rx_desc(&xsk->rx, idx_rx)->addr;
+               xsk_ring_cons__rx_desc(&xsk->rx, idx_rx++);
+               orig = xsk_umem__extract_addr(addr);
 
                addr = xsk_umem__add_offset_to_addr(addr);
                pkt_node_rx = malloc(sizeof(struct pkt) + PKT_SIZE);
@@ -905,6 +907,8 @@ static void *worker_testapp_validate(void *arg)
 
 static void testapp_validate(void)
 {
+       struct timespec max_wait = { 0, 0 };
+
        pthread_attr_init(&attr);
        pthread_attr_setstacksize(&attr, THREAD_STACK);
 
@@ -929,8 +933,6 @@ static void testapp_validate(void)
                        exit_with_error(errno);
        }
 
-       struct timespec max_wait = { 0, 0 };
-
        if (clock_gettime(CLOCK_REALTIME, &max_wait))
                exit_with_error(errno);
        max_wait.tv_sec += TMOUT_SEC;