From patchwork Wed Mar 19 17:57:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 3937 Return-Path: Received: from s3.neomailbox.net (s3.neomailbox.net [178.209.62.157]) by open-mesh.org (Postfix) with ESMTPS id 10EDA602331 for ; Wed, 19 Mar 2014 18:57:51 +0100 (CET) From: Antonio Quartulli To: b.a.t.m.a.n@lists.open-mesh.org Date: Wed, 19 Mar 2014 18:57:33 +0100 Message-Id: <1395251855-30765-5-git-send-email-antonio@meshcoding.com> In-Reply-To: <1395251855-30765-1-git-send-email-antonio@meshcoding.com> References: <1395251747-27289-1-git-send-email-antonio@meshcoding.com> <1395251855-30765-1-git-send-email-antonio@meshcoding.com> MIME-Version: 1.0 Cc: Antonio Quartulli Subject: [B.A.T.M.A.N.] [PATCHv4 next 09/11] batman-adv: fix code style X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Mar 2014 17:57:51 -0000 - don't split lines if shorter than 80 chars - don't use goto if there is no cleanup to perform Introduced by 90ad6a40c80323805be1e86504385de2bd861f0a ("batman-adv: Modified forwarding behaviour for multicast packets") Cc: Linux Lüssing Signed-off-by: Antonio Quartulli --- multicast.c | 3 +-- multicast.h | 8 ++++---- translation-table.c | 5 ++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/multicast.c b/multicast.c index 9a9e7f4..d67d75d 100644 --- a/multicast.c +++ b/multicast.c @@ -312,8 +312,7 @@ static int batadv_mcast_forw_mode_check_ipv6(struct batadv_priv *bat_priv, /* TODO: Implement Multicast Router Discovery (RFC4286), * then allow scope > link local, too */ - if (IPV6_ADDR_MC_SCOPE(&ip6hdr->daddr) != - IPV6_ADDR_SCOPE_LINKLOCAL) + if (IPV6_ADDR_MC_SCOPE(&ip6hdr->daddr) != IPV6_ADDR_SCOPE_LINKLOCAL) return -EINVAL; /* link-local-all-nodes multicast listeners behind a bridge are diff --git a/multicast.h b/multicast.h index 2861899..73b5d45 100644 --- a/multicast.h +++ b/multicast.h @@ -20,10 +20,10 @@ /** * batadv_forw_mode - the way a packet should be forwarded as - * @BATADV_FORW_ALL: forward the packet to all nodes - * (currently via classic flooding) - * @BATADV_FORW_SINGLE: forward the packet to a single node - * (currently via the BATMAN unicast routing protocol) + * @BATADV_FORW_ALL: forward the packet to all nodes (currently via classic + * flooding) + * @BATADV_FORW_SINGLE: forward the packet to a single node (currently via the + * BATMAN unicast routing protocol) * @BATADV_FORW_NONE: don't forward, drop it */ enum batadv_forw_mode { diff --git a/translation-table.c b/translation-table.c index dab5c39..d636bde 100644 --- a/translation-table.c +++ b/translation-table.c @@ -206,16 +206,15 @@ int batadv_tt_global_hash_count(struct batadv_priv *bat_priv, const uint8_t *addr, unsigned short vid) { struct batadv_tt_global_entry *tt_global_entry; - int count = 0; + int count; tt_global_entry = batadv_tt_global_hash_find(bat_priv, addr, vid); if (!tt_global_entry) - goto out; + return 0; count = atomic_read(&tt_global_entry->orig_list_count); batadv_tt_global_entry_free_ref(tt_global_entry); -out: return count; }