From patchwork Thu Dec 21 09:17:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17242 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id D3A2681E64; Thu, 21 Dec 2017 10:20:27 +0100 (CET) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=openmesh-com.20150623.gappssmtp.com header.i=@openmesh-com.20150623.gappssmtp.com header.b="X8HbLvl2"; dkim-atps=neutral Received-SPF: None (mailfrom) identity=mailfrom; client-ip=2a00:1450:400c:c0c::242; helo=mail-wr0-x242.google.com; envelope-from=sven.eckelmann@openmesh.com; receiver= Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) by open-mesh.org (Postfix) with ESMTPS id E1BD880999 for ; Thu, 21 Dec 2017 10:20:17 +0100 (CET) Received: by mail-wr0-x242.google.com with SMTP id h1so24544589wre.12 for ; Thu, 21 Dec 2017 01:20:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openmesh-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ggGs8BcqryHMDl7w4vqLn6eKszlLWq+uijQCMtKlu/A=; b=X8HbLvl2MhWmTIlMjkYfCDrzvBx9cELOeaq4hLXRCy8GjihucAjou8LRd0yiGV+1iw e5Ibk/da3raP4y6Yu/0HPc7EwoC/tDbjY4SKaTNaWOIsaLPczFFuXGKaf6/7lg3Log1m bWxmA/Gd4GMsi6JfCLL1+ao8qvRP+03uzjC8ZLDrUNLDmkXzVljU7s/fV1MdpKUcIwL+ 8+FisJagcgCm7MMe0t/m2V9Gyn/ARQBSdtaW7OVH7ndZzKqOA4gqfHzaBlcwuBCPtIhl 93blIYcWi3jhDMKAHA0cemhnI1SuAmQ8R7jrwyco3KK7rjGdI63Nx3mTVDhXIsAWTBXm peTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ggGs8BcqryHMDl7w4vqLn6eKszlLWq+uijQCMtKlu/A=; b=Pm4Jl0WO1oZjP3khOuVV6EZT6RSjyg11yZfYBvHggAxvEJBAFJXyFT6HJ/fCVLXQGI cj9Giq42L55C1YXOOAQmhf7NOVj6T7ex2bkeGeNeyhiu3OXXE13Z7cjmxGXVGnNTYYuD UEWm25FC7Zxizvczrz0nSz2zzRaZmDdZRnopDE42tLS3yoOA4lnvvf1Pe2pzBjFirS1w RmoIAJsp0cwHAV6PxjKvYx0MScp0DqwPjrUKWEr1CBY1NMZQTxERV7cA4O+FYYP1IzPP n7Q2g2kjvjEt1nITXXMCZGcyyIQZGC9Epd0rcGyFFqTUCG8UpHs4QX96bLUFr0fHcBQQ r4AQ== X-Gm-Message-State: AKGB3mLXo7+dL710t6IoZdxMih7A47BtyO/5pHF/0zkbjiKkSAlLFNSO MBGx8awB8zuGwEjiuHLoUZZA74OG4XU= X-Google-Smtp-Source: ACJfBovZC+Wx8uioi4vQePZNOihE+MxrOpFHRdwNcZBAf10mVJ4eptM5NUuV6xz7XsKt6YYPeNhPag== X-Received: by 10.223.136.118 with SMTP id e51mr10694390wre.21.1513848017210; Thu, 21 Dec 2017 01:20:17 -0800 (PST) Received: from sven-desktop.home.narfation.org (p2003007C6F508A00A5003EEAB9F6E50C.dip0.t-ipconnect.de. [2003:7c:6f50:8a00:a500:3eea:b9f6:e50c]) by smtp.gmail.com with ESMTPSA id m201sm3458912wma.13.2017.12.21.01.20.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Dec 2017 01:20:16 -0800 (PST) From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 21 Dec 2017 10:17:39 +0100 Message-Id: <20171221091742.8020-3-sven.eckelmann@openmesh.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171221091742.8020-1-sven.eckelmann@openmesh.com> References: <20171221091742.8020-1-sven.eckelmann@openmesh.com> Subject: [B.A.T.M.A.N.] [PATCH v4 2/5] batman-adv: Remove usage of BIT(x) in packet.h X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Cc: Willem de Bruijn , netdev@vger.kernel.org, Sven Eckelmann , Jiri Pirko , linux-kernel@vger.kernel.org, Eric Dumazet , Tom Herbert Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" The BIT(x) macro is no longer available for uapi headers because it is defined outside of it (linux/bitops.h). The use of it must therefore be avoided and replaced by an appropriate other representation. Signed-off-by: Sven Eckelmann --- net/batman-adv/packet.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index 6b6563867455..44f20d03205b 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -20,7 +20,6 @@ #define _NET_BATMAN_ADV_PACKET_H_ #include -#include #include #include @@ -92,9 +91,9 @@ enum batadv_subtype { * one hop neighbor on the interface where it was originally received. */ enum batadv_iv_flags { - BATADV_NOT_BEST_NEXT_HOP = BIT(0), - BATADV_PRIMARIES_FIRST_HOP = BIT(1), - BATADV_DIRECTLINK = BIT(2), + BATADV_NOT_BEST_NEXT_HOP = 1UL << 0, + BATADV_PRIMARIES_FIRST_HOP = 1UL << 1, + BATADV_DIRECTLINK = 1UL << 2, }; /** @@ -123,9 +122,9 @@ enum batadv_icmp_packettype { * @BATADV_MCAST_WANT_ALL_IPV6: we want all IPv6 multicast packets */ enum batadv_mcast_flags { - BATADV_MCAST_WANT_ALL_UNSNOOPABLES = BIT(0), - BATADV_MCAST_WANT_ALL_IPV4 = BIT(1), - BATADV_MCAST_WANT_ALL_IPV6 = BIT(2), + BATADV_MCAST_WANT_ALL_UNSNOOPABLES = 1UL << 0, + BATADV_MCAST_WANT_ALL_IPV4 = 1UL << 1, + BATADV_MCAST_WANT_ALL_IPV6 = 1UL << 2, }; /* tt data subtypes */ @@ -139,10 +138,10 @@ enum batadv_mcast_flags { * @BATADV_TT_FULL_TABLE: contains full table to replace existing table */ enum batadv_tt_data_flags { - BATADV_TT_OGM_DIFF = BIT(0), - BATADV_TT_REQUEST = BIT(1), - BATADV_TT_RESPONSE = BIT(2), - BATADV_TT_FULL_TABLE = BIT(4), + BATADV_TT_OGM_DIFF = 1UL << 0, + BATADV_TT_REQUEST = 1UL << 1, + BATADV_TT_RESPONSE = 1UL << 2, + BATADV_TT_FULL_TABLE = 1UL << 4, }; /** @@ -150,7 +149,7 @@ enum batadv_tt_data_flags { * @BATADV_VLAN_HAS_TAG: whether the field contains a valid vlan tag or not */ enum batadv_vlan_flags { - BATADV_VLAN_HAS_TAG = BIT(15), + BATADV_VLAN_HAS_TAG = 1UL << 15, }; /**