[PATCH] minor changes in libbpf/bpf_impl.c

[Adam Kandur]

>From b34cb5582b6f73543805d6ebbca945d6acdab419 Mon Sep 17 00:00:00 2001
From: Adam Kandur <rndd@tuta.io>
Date: Tue, 15 Jun 2021 10:44:53 +0300
Subject: [PATCH] minor changes in libbpf/bpf_impl.c

---
libbpf/bpf_impl.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/libbpf/bpf_impl.c b/libbpf/bpf_impl.c
index 6eb9dda3..13465304 100644
--- a/libbpf/bpf_impl.c
+++ b/libbpf/bpf_impl.c
@@ -508,9 +508,9 @@ hash_ent_remove (if_filter_list_t *ifp, net_hash_header_t 
hp, int used,
return TRUE;
}
return FALSE;
-               } else {
-                       *head = (net_hash_entry_t)queue_next((queue_t) entp);
}
+                else
+                  *head = (net_hash_entry_t)queue_next((queue_t) entp);
}

remqueue((queue_t)*head, (queue_entry_t)entp);
@@ -589,17 +589,19 @@ net_set_filter(if_filter_list_t *ifp, mach_port_t 
rcv_port, int priority,
filter_bytes = CSPF_BYTES (filter_count);
match = (bpf_insn_t) 0;

-       if (filter_count == 0) {
-               return (D_INVALID_OPERATION);
-       } else if (!((filter[0] & NETF_IN) || (filter[0] & NETF_OUT))) {
-               return (D_INVALID_OPERATION); /* NETF_IN or NETF_OUT required */
-       } else if ((filter[0] & NETF_TYPE_MASK) == NETF_BPF) {
+       if (filter_count == 0)
+          return (D_INVALID_OPERATION);
+       else if (!((filter[0] & NETF_IN) || (filter[0] & NETF_OUT)))
+          return (D_INVALID_OPERATION); /* NETF_IN or NETF_OUT required */
+       else if ((filter[0] & NETF_TYPE_MASK) == NETF_BPF)
+          {
ret = bpf_validate((bpf_insn_t)filter, filter_bytes, &match);
if (!ret)
return (D_INVALID_OPERATION);
-       } else {
-               return (D_INVALID_OPERATION);
-       }
+          }
+        else
+          return (D_INVALID_OPERATION);
+
debug ("net_set_filter: check over\n");

rval = D_SUCCESS;         /* default return value */
--
2.32.0