From: Linus Lüssing <linus.luessing@c0d3.blue>
Date: Mon, 11 Jul 2016 09:16:36 +0000 (+0200)
Subject: batman-adv: Use bitwise instead of arithmetic operator for flags
X-Git-Tag: v4.9-rc1~14^2~117^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d7de48c797c9207412da4e350c5170617eaf8c7;p=thirdparty%2Fkernel%2Flinux.git

batman-adv: Use bitwise instead of arithmetic operator for flags

This silences the following coccinelle warning:

"WARNING: sum of probable bitmasks, consider |"

Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---

diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
index cc915073a7539..894df6020f6ab 100644
--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
@@ -528,7 +528,7 @@ update:
 	}
 
 	return !(mcast_data.flags &
-		 (BATADV_MCAST_WANT_ALL_IPV4 + BATADV_MCAST_WANT_ALL_IPV6));
+		 (BATADV_MCAST_WANT_ALL_IPV4 | BATADV_MCAST_WANT_ALL_IPV6));
 }
 
 /**