From patchwork Thu Mar 1 07:35:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 1591 Return-Path: Received: from nm22-vm6.bullet.mail.ukl.yahoo.com (nm22-vm6.bullet.mail.ukl.yahoo.com [217.12.10.37]) by open-mesh.org (Postfix) with SMTP id 592CE6008D5 for ; Thu, 1 Mar 2012 08:36:24 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@yahoo.de; dkim-adsp=none Received: from [217.146.183.183] by nm22.bullet.mail.ukl.yahoo.com with NNFMP; 01 Mar 2012 07:36:23 -0000 Received: from [77.238.184.68] by tm14.bullet.mail.ukl.yahoo.com with NNFMP; 01 Mar 2012 07:36:23 -0000 Received: from [127.0.0.1] by smtp137.mail.ukl.yahoo.com with NNFMP; 01 Mar 2012 07:36:23 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1330587383; bh=G4zFyGEwI/Nuh8pMxniXU2eAq5M/MTUI4hcbkuZVBPk=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=0g8rZbu5MsjMJyQ7/HDdtRUl5ZWeOwN2qtBXjaUHjHDBAdH/gdZ5PXHXzqn4fm6lDZ0VxtajMMllqXZ3tFD80zpn18VOfZsBqiZOHhcqYtQKKO+6FaH4qYLtUIyZwlugYCalS1D3ZuQx6bL5+LUPVHTmFKepBLSORSU2zDcJPis= X-Yahoo-Newman-Id: 692737.55230.bm@smtp137.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: Xjn4K0oVM1mMq2JGVqby8dzjZR44_Nhh.IxOq9ODTxloe7a y81LlThPFjJCGYS5pfIAfWCa4PfyoqRDNqQciDYJoflUDFfu.Ev8cH1_fwBv uhIfUZLQIRs1Po.iWsNFRYsy3Q_F3jYtnA9f6M34ILbjneq0wUXWg58FyZMr IH7J847_88BWvJZMQQ45f.P0wMgLOcdXEq9erzWzQbRyNWno31hK_GWnzyca G.lrImxGGowkrV2Xvoynkr.g1bM7lQhh_LaxyIg_CQfMCHK1MCu4tVak_EbT Fgnq3jWAjw2TDuIxtWDa3xGp4K6edKgY4hkY63zzADXHk08sZZGhDbgHK2OY FE57KfJQjAqb0OWHRN2Au7bjT5so0hyS59EwITJt9mscJP5OruHkuhamN01T SM1f3c1YlxgpyyXQ7B3sImt.lpr3JZ9PpIJ9xaZxgdA2S X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@119.236.110.45 with plain) by smtp137.mail.ukl.yahoo.com with SMTP; 01 Mar 2012 07:36:22 +0000 GMT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 1 Mar 2012 15:35:19 +0800 Message-Id: <1330587321-12177-4-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1330587321-12177-1-git-send-email-lindner_marek@yahoo.de> References: <1330587321-12177-1-git-send-email-lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 4/6] batman-adv: rename last_valid to last_seen 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, 01 Mar 2012 07:36:24 -0000 Signed-off-by: Marek Lindner --- bat_iv_ogm.c | 8 ++++---- originator.c | 16 ++++++++-------- types.h | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 5833a3e..209722f 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -655,7 +655,7 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv, rcu_read_unlock(); orig_node->flags = batman_ogm_packet->flags; - neigh_node->last_valid = jiffies; + neigh_node->last_seen = jiffies; spin_lock_bh(&neigh_node->tq_lock); ring_buffer_set(neigh_node->tq_recv, @@ -776,11 +776,11 @@ static int bat_iv_ogm_calc_tq(struct orig_node *orig_node, if (!neigh_node) goto out; - /* if orig_node is direct neighbor update neigh_node last_valid */ + /* if orig_node is direct neighbor update neigh_node last_seen */ if (orig_node == orig_neigh_node) - neigh_node->last_valid = jiffies; + neigh_node->last_seen = jiffies; - orig_node->last_valid = jiffies; + orig_node->last_seen = jiffies; /* find packet count of corresponding one hop neighbor */ spin_lock_bh(&orig_node->ogm_cnt_lock); diff --git a/originator.c b/originator.c index 06c8187..aa33337 100644 --- a/originator.c +++ b/originator.c @@ -285,7 +285,7 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, hlist_for_each_entry_safe(neigh_node, node, node_tmp, &orig_node->neigh_list, list) { - if ((has_timed_out(neigh_node->last_valid, PURGE_TIMEOUT)) || + if ((has_timed_out(neigh_node->last_seen, PURGE_TIMEOUT)) || (neigh_node->if_incoming->if_status == IF_INACTIVE) || (neigh_node->if_incoming->if_status == IF_NOT_IN_USE) || (neigh_node->if_incoming->if_status == IF_TO_BE_REMOVED)) { @@ -304,9 +304,9 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, else bat_dbg(DBG_BATMAN, bat_priv, "neighbor timeout: originator %pM, " - "neighbor: %pM, last_valid: %lu\n", + "neighbor: %pM, last_seen: %lu\n", orig_node->orig, neigh_node->addr, - (neigh_node->last_valid / HZ)); + (neigh_node->last_seen / HZ)); neigh_purged = true; @@ -329,10 +329,10 @@ static bool purge_orig_node(struct bat_priv *bat_priv, { struct neigh_node *best_neigh_node; - if (has_timed_out(orig_node->last_valid, 2 * PURGE_TIMEOUT)) { + if (has_timed_out(orig_node->last_seen, 2 * PURGE_TIMEOUT)) { bat_dbg(DBG_BATMAN, bat_priv, - "Originator timeout: originator %pM, last_valid %lu\n", - orig_node->orig, (orig_node->last_valid / HZ)); + "Originator timeout: originator %pM, last_seen %lu\n", + orig_node->orig, (orig_node->last_seen / HZ)); return true; } else { if (purge_orig_neighbors(bat_priv, orig_node, @@ -450,9 +450,9 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) goto next; last_seen_secs = jiffies_to_msecs(jiffies - - orig_node->last_valid) / 1000; + orig_node->last_seen) / 1000; last_seen_msecs = jiffies_to_msecs(jiffies - - orig_node->last_valid) % 1000; + orig_node->last_seen) % 1000; seq_printf(seq, "%pM %4i.%03is (%3i) %pM [%10s]:", orig_node->orig, last_seen_secs, diff --git a/types.h b/types.h index 51c59c2..0643271 100644 --- a/types.h +++ b/types.h @@ -64,7 +64,7 @@ struct hard_iface { /** * orig_node - structure for orig_list maintaining nodes of mesh * @primary_addr: hosts primary interface address - * @last_valid: when last packet from this node was received + * @last_seen: when last packet from this node was received * @bcast_seqno_reset: time when the broadcast seqno window was reset * @batman_seqno_reset: time when the batman seqno window was reset * @gw_flags: flags related to gateway class @@ -85,7 +85,7 @@ struct orig_node { struct neigh_node __rcu *router; /* rcu protected pointer */ unsigned long *bcast_own; uint8_t *bcast_own_sum; - unsigned long last_valid; + unsigned long last_seen; unsigned long bcast_seqno_reset; unsigned long batman_seqno_reset; uint8_t gw_flags; @@ -135,7 +135,7 @@ struct gw_node { /** * neigh_node - * @last_valid: when last packet via this neighbor was received + * @last_seen: when last packet via this neighbor was received */ struct neigh_node { struct hlist_node list; @@ -146,7 +146,7 @@ struct neigh_node { uint8_t tq_avg; uint8_t last_ttl; struct list_head bonding_list; - unsigned long last_valid; + unsigned long last_seen; DECLARE_BITMAP(real_bits, TQ_LOCAL_WINDOW_SIZE); atomic_t refcount; struct rcu_head rcu;