From patchwork Thu Jan 12 18:07:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 1472 Return-Path: Received: from confino.investici.org (investici.nine.ch [217.150.252.179]) by open-mesh.org (Postfix) with ESMTPS id 9367C6007D3 for ; Thu, 12 Jan 2012 19:07:39 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@autistici.org; dkim-adsp=pass Received: from [217.150.252.179] (confino [217.150.252.179]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id BA0D2C864F; Thu, 12 Jan 2012 18:07:38 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 confino.investici.org BA0D2C864F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1326391659; bh=UCDWva6XyAkCpWjm/0CO8dlavBKJtqrvkvyn+ie3Xy0=; h=From:To:Cc:Subject:Date:Message-Id; b=M4+XmXSolB0n0S5eBwC2GwGRaWTBwp4CKZIZFNjasbCgdMz7Yx9ailopURrGkRXlf U0Brmi82SZNKbKJl4dloBCYLF/sWOcfk9WvqMogBTxVtFu5caQEl8YjwsfWl5/CzvA 5mZ702zXykrc0Ipi2DvnyqkNfyUiq9hqnKRNhY/s= From: Antonio Quartulli To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 12 Jan 2012 19:07:00 +0100 Message-Id: <1326391620-28509-1-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.7.3.4 Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: TT_CLIENT_PENDING is never set in struct tt_global_entry X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 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: Thu, 12 Jan 2012 18:07:39 -0000 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 Signed-off-by: Antonio Quartulli --- translation-table.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/translation-table.c b/translation-table.c index d105cbd..27753a0 100644 --- a/translation-table.c +++ b/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: