b.a.t.m.a.n.lists.open-mesh.org archive mirror
 help / color / mirror / Atom feed
From: Marek Lindner <lindner_marek@yahoo.de>
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 6/8] batman-adv: TT_CLIENT_PENDING is never set in struct tt_global_entry
Date: Tue, 28 Feb 2012 19:32:26 +0800	[thread overview]
Message-ID: <1330428748-23137-7-git-send-email-lindner_marek@yahoo.de> (raw)
In-Reply-To: <1330428748-23137-1-git-send-email-lindner_marek@yahoo.de>

From: Antonio Quartulli <ordex@autistici.org>

Actually the TT_CLIENT_PENDING flag is never set in the tt_global_entry
structure, therefore this code is useless and can be removed.

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

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 1ff7fbe..9a6f315 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -603,7 +603,7 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset)
 						       struct tt_global_entry,
 						       common);
 			seq_printf(seq, " * %pM  (%3u) via %pM     (%3u)   "
-					"[%c%c%c]\n",
+					"[%c%c]\n",
 					tt_global_entry->common.addr,
 					tt_global_entry->ttvn,
 					tt_global_entry->orig_node->orig,
@@ -613,8 +613,6 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset)
 					(tt_global_entry->common.flags &
 					 TT_CLIENT_ROAM ? 'R' : '.'),
 					(tt_global_entry->common.flags &
-					 TT_CLIENT_PENDING ? 'X' : '.'),
-					(tt_global_entry->common.flags &
 					 TT_CLIENT_WIFI ? 'W' : '.'));
 		}
 		rcu_read_unlock();
@@ -838,11 +836,6 @@ struct orig_node *transtable_search(struct bat_priv *bat_priv,
 	if (!atomic_inc_not_zero(&tt_global_entry->orig_node->refcount))
 		goto out;
 
-	/* A global client marked as PENDING has already moved from that
-	 * originator */
-	if (tt_global_entry->common.flags & TT_CLIENT_PENDING)
-		goto out;
-
 	orig_node = tt_global_entry->orig_node;
 
 out:
-- 
1.7.9


  parent reply	other threads:[~2012-02-28 11:32 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-28 11:32 [B.A.T.M.A.N.] pull request: batman-adv 2012-02-28 Marek Lindner
2012-02-28 11:32 ` [B.A.T.M.A.N.] [PATCH 1/8] batman-adv: convert time_after instances to has_timed_out Marek Lindner
2012-02-28 11:32 ` [B.A.T.M.A.N.] [PATCH 2/8] batman-adv: refactor tt_global_del() to avoid misalignment Marek Lindner
2012-02-28 11:32 ` [B.A.T.M.A.N.] [PATCH 3/8] batman-adv: Update copyright years Marek Lindner
2012-02-28 11:32 ` [B.A.T.M.A.N.] [PATCH 4/8] batman-adv: set TT_CLIENT_NEW flag before invoking hash_add() Marek Lindner
2012-02-28 11:32 ` [B.A.T.M.A.N.] [PATCH 5/8] batman-adv: code refactoring - move debug print into tt_local_set_pending Marek Lindner
2012-02-28 11:32 ` Marek Lindner [this message]
2012-02-28 11:38 ` [B.A.T.M.A.N.] [PATCH 6/8] batman-adv: TT_CLIENT_PENDING is never set in struct tt_global_entry Marek Lindner
2012-02-28 11:39 ` [B.A.T.M.A.N.] [PATCH 7/8] batman-adv: Start new development cycle Marek Lindner
2012-02-28 11:39 ` [B.A.T.M.A.N.] [PATCH 8/8] batman-adv: Fix indentation of multiline statements Marek Lindner
2012-02-28 20:09 ` [B.A.T.M.A.N.] pull request: batman-adv 2012-02-28 David Miller

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=1330428748-23137-7-git-send-email-lindner_marek@yahoo.de \
    --to=lindner_marek@yahoo.de \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    --cc=davem@davemloft.net \
    --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).