b.a.t.m.a.n.lists.open-mesh.org archive mirror
 help / color / mirror / Atom feed
From: Antonio Quartulli <ordex@autistici.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
	Marek Lindner <lindner_marek@yahoo.de>
Subject: [B.A.T.M.A.N.] [PATCH 02/15] batman-adv: introduce is_single_hop_neigh variable to increase readability
Date: Fri, 11 May 2012 14:21:19 +0200	[thread overview]
Message-ID: <1336738892-7401-3-git-send-email-ordex@autistici.org> (raw)
In-Reply-To: <1336738892-7401-1-git-send-email-ordex@autistici.org>

From: Marek Lindner <lindner_marek@yahoo.de>

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Acked-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
 net/batman-adv/bat_iv_ogm.c |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 8b2db2e..cd8f473 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -480,7 +480,8 @@ static void bat_iv_ogm_queue_add(struct bat_priv *bat_priv,
 static void bat_iv_ogm_forward(struct orig_node *orig_node,
 			       const struct ethhdr *ethhdr,
 			       struct batman_ogm_packet *batman_ogm_packet,
-			       int directlink, struct hard_iface *if_incoming)
+			       bool is_single_hop_neigh,
+			       struct hard_iface *if_incoming)
 {
 	struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
 	struct neigh_node *router;
@@ -533,7 +534,7 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node,
 
 	/* switch of primaries first hop flag when forwarding */
 	batman_ogm_packet->flags &= ~PRIMARIES_FIRST_HOP;
-	if (directlink)
+	if (is_single_hop_neigh)
 		batman_ogm_packet->flags |= DIRECTLINK;
 	else
 		batman_ogm_packet->flags &= ~DIRECTLINK;
@@ -918,7 +919,8 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
 	struct neigh_node *orig_neigh_router = NULL;
 	int has_directlink_flag;
 	int is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0;
-	int is_broadcast = 0, is_bidirectional, is_single_hop_neigh;
+	int is_broadcast = 0, is_bidirectional;
+	bool is_single_hop_neigh = false;
 	int is_duplicate;
 	uint32_t if_incoming_seqno;
 
@@ -942,8 +944,8 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
 
 	has_directlink_flag = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);
 
-	is_single_hop_neigh = (compare_eth(ethhdr->h_source,
-					   batman_ogm_packet->orig) ? 1 : 0);
+	if (compare_eth(ethhdr->h_source, batman_ogm_packet->orig))
+		is_single_hop_neigh = true;
 
 	bat_dbg(DBG_BATMAN, bat_priv,
 		"Received BATMAN packet via NB: %pM, IF: %s [%pM] (from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, crc %u, changes %u, td %d, TTL %d, V %d, IDF %d)\n",
@@ -1114,7 +1116,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
 
 		/* mark direct link on incoming interface */
 		bat_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet,
-				   1, if_incoming);
+				   is_single_hop_neigh, if_incoming);
 
 		bat_dbg(DBG_BATMAN, bat_priv,
 			"Forwarding packet: rebroadcast neighbor packet with direct link flag\n");
@@ -1137,7 +1139,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
 	bat_dbg(DBG_BATMAN, bat_priv,
 		"Forwarding packet: rebroadcast originator packet\n");
 	bat_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet,
-			   0, if_incoming);
+			   is_single_hop_neigh, if_incoming);
 
 out_neigh:
 	if ((orig_neigh_node) && (!is_single_hop_neigh))
-- 
1.7.9.4


  parent reply	other threads:[~2012-05-11 12:21 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-11 12:21 [B.A.T.M.A.N.] pull request: batman-adv 2012-05-11 Antonio Quartulli
2012-05-11 12:21 ` [B.A.T.M.A.N.] [PATCH 01/15] batman-adv: fix wrong dhcp option list browsing Antonio Quartulli
2012-05-11 12:21 ` Antonio Quartulli [this message]
2012-05-11 12:21 ` [B.A.T.M.A.N.] [PATCH 03/15] batman-adv: introduce packet type handler array for incoming packets Antonio Quartulli
2012-05-11 12:21 ` [B.A.T.M.A.N.] [PATCH 04/15] batman-adv: register batman ogm receive function during protocol init Antonio Quartulli
2012-05-11 12:21 ` [B.A.T.M.A.N.] [PATCH 05/15] batman-adv: rename last_valid to last_seen Antonio Quartulli
2012-05-11 12:21 ` [B.A.T.M.A.N.] [PATCH 06/15] batman-adv: replace HZ calculations with jiffies_to_msecs() Antonio Quartulli
2012-05-11 12:21 ` [B.A.T.M.A.N.] [PATCH 07/15] batman-adv: split neigh_new function into generic and batman iv specific parts Antonio Quartulli
2012-05-11 12:21 ` [B.A.T.M.A.N.] [PATCH 08/15] batman-adv: ignore protocol packets if the interface did not enable this protocol Antonio Quartulli
2012-05-11 12:21 ` [B.A.T.M.A.N.] [PATCH 09/15] batman-adv: refactoring API: find generalized name for bat_ogm_update_mac callback Antonio Quartulli
2012-05-11 12:21 ` [B.A.T.M.A.N.] [PATCH 10/15] batman-adv: rename sysfs macros to reflect the soft-interface dependency Antonio Quartulli
2012-05-11 12:21 ` [B.A.T.M.A.N.] [PATCH 11/15] batman-adv: Adding hard_iface specific sysfs wrapper macros for UINT Antonio Quartulli
2012-05-11 12:21 ` [B.A.T.M.A.N.] [PATCH 12/15] batman-adv: avoid temporary routing loops by being strict on forwarded OGMs Antonio Quartulli
2012-05-11 12:21 ` [B.A.T.M.A.N.] [PATCH 13/15] batman-adv: fix checkpatch string complaint Antonio Quartulli
2012-05-11 12:21 ` [B.A.T.M.A.N.] [PATCH 14/15] batman-adv: update copyright years Antonio Quartulli
2012-05-11 12:21 ` [B.A.T.M.A.N.] [PATCH 15/15] batman-adv: add contributor name Antonio Quartulli
2012-05-11 22:01 ` [B.A.T.M.A.N.] pull request: batman-adv 2012-05-11 David Miller
2012-05-11 22:10   ` Sven Eckelmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1336738892-7401-3-git-send-email-ordex@autistici.org \
    --to=ordex@autistici.org \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    --cc=davem@davemloft.net \
    --cc=lindner_marek@yahoo.de \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).