diff mbox series

[net-next,v2] geneve: Get rid of is_all_zero(), streamline is_tnl_info_zero()

Message ID 2f3e906b339869a22c9b7c438c8b854c4bfb885b.1508485663.git.sbrivio@redhat.com
State Accepted, archived
Delegated to: David Miller
Headers show
Series [net-next,v2] geneve: Get rid of is_all_zero(), streamline is_tnl_info_zero() | expand

Commit Message

Stefano Brivio Oct. 20, 2017, 11:31 a.m. UTC 
No need to re-invent memchr_inv() with !is_all_zero(). While at
it, replace conditional and return clauses with a single return
clause in is_tnl_info_zero().

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
v2: Fix obvious "typos"

 drivers/net/geneve.c | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

Comments

David Miller Oct. 22, 2017, 1:43 a.m. UTC | #1 
From: Stefano Brivio <sbrivio@redhat.com>
Date: Fri, 20 Oct 2017 13:31:36 +0200

> No need to re-invent memchr_inv() with !is_all_zero(). While at
> it, replace conditional and return clauses with a single return
> clause in is_tnl_info_zero().
> 
> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

Applied.
diff mbox series

Patch

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index f6404074b7b0..01f7355ad277 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -1140,24 +1140,11 @@  static struct geneve_dev *geneve_find_dev(struct geneve_net *gn,
 	return t;
 }
 
-static bool is_all_zero(const u8 *fp, size_t size)
-{
-	int i;
-
-	for (i = 0; i < size; i++)
-		if (fp[i])
-			return false;
-	return true;
-}
-
 static bool is_tnl_info_zero(const struct ip_tunnel_info *info)
 {
-	if (info->key.tun_id || info->key.tun_flags || info->key.tos ||
-	    info->key.ttl || info->key.label || info->key.tp_src ||
-	    !is_all_zero((const u8 *)&info->key.u, sizeof(info->key.u)))
-		return false;
-	else
-		return true;
+	return !(info->key.tun_id || info->key.tun_flags || info->key.tos ||
+		 info->key.ttl || info->key.label || info->key.tp_src ||
+		 memchr_inv(&info->key.u, 0, sizeof(info->key.u)));
 }
 
 static bool geneve_dst_addr_equal(struct ip_tunnel_info *a,