selftests/bpf: Simplify the calculation of variables

Fix the following coccicheck warnings:

./tools/testing/selftests/bpf/xdpxceiver.c:954:28-30: WARNING !A || A &&
B is equivalent to !A || B.

./tools/testing/selftests/bpf/xdpxceiver.c:932:28-30: WARNING !A || A &&
B is equivalent to !A || B.

./tools/testing/selftests/bpf/xdpxceiver.c:909:28-30: WARNING !A || A &&
B is equivalent to !A || B.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/1612860398-102839-1-git-send-email-jiapeng.chong@linux.alibaba.com

diff --git a/tools/testing/selftests/bpf/xdpxceiver.c b/tools/testing/selftests/bpf/xdpxceiver.c
index 99ea6cf069e68ee84237f2ed8d4edb7821719be8..f4a96d5ff524edb1f43c2f4ecab7cc7d39188010 100644 (file)
--- a/tools/testing/selftests/bpf/xdpxceiver.c
+++ b/tools/testing/selftests/bpf/xdpxceiver.c
@@ -897,7 +897,7 @@ static void *worker_testapp_validate(void *arg)
                        ksft_print_msg("Destroying socket\n");
        }
 
-       if (!opt_bidi || (opt_bidi && bidi_pass)) {
+       if (!opt_bidi || bidi_pass) {
                xsk_socket__delete(ifobject->xsk->xsk);
                (void)xsk_umem__delete(ifobject->umem->umem);
        }
@@ -922,7 +922,7 @@ static void testapp_validate(void)
        pthread_mutex_lock(&sync_mutex);
 
        /*Spawn RX thread */
-       if (!opt_bidi || (opt_bidi && !bidi_pass)) {
+       if (!opt_bidi || !bidi_pass) {
                if (pthread_create(&t0, &attr, worker_testapp_validate, ifdict[1]))
                        exit_with_error(errno);
        } else if (opt_bidi && bidi_pass) {
@@ -942,7 +942,7 @@ static void testapp_validate(void)
        pthread_mutex_unlock(&sync_mutex);
 
        /*Spawn TX thread */
-       if (!opt_bidi || (opt_bidi && !bidi_pass)) {
+       if (!opt_bidi || !bidi_pass) {
                if (pthread_create(&t1, &attr, worker_testapp_validate, ifdict[0]))
                        exit_with_error(errno);
        } else if (opt_bidi && bidi_pass) {