From patchwork Sat Mar 17 07:28:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 1625 Return-Path: Received: from nm7.bullet.mail.ukl.yahoo.com (nm7.bullet.mail.ukl.yahoo.com [217.146.182.248]) by open-mesh.org (Postfix) with SMTP id 39DCF600753 for ; Sat, 17 Mar 2012 08:29:15 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@yahoo.de; dkim-adsp=none Received: from [217.146.183.209] by nm7.bullet.mail.ukl.yahoo.com with NNFMP; 17 Mar 2012 07:29:14 -0000 Received: from [217.146.183.25] by tm2.bullet.mail.ukl.yahoo.com with NNFMP; 17 Mar 2012 07:29:14 -0000 Received: from [127.0.0.1] by smtp156.mail.ukl.yahoo.com with NNFMP; 17 Mar 2012 07:29:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1331969354; bh=aRvFa/P2qCJf0u7mpv9moJIXxPEoKN6yx3YXiYS6fvA=; 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; b=1mPudrm4KD/4yA+hBB5Gi4YYknIfnpJJ3d1jBKYvnh34rG3c2fleUnEVHsKH2NpzX5ouMTpO1d76HXPsrZCNw5v3SLN0aoPMLPDcEoy7La6+ta/R0dHiwujtP8TbzdSVOixncj4DxurueYUNhAyZT/JL+DQrgfJPqdwihGNPcXc= X-Yahoo-Newman-Id: 932151.10121.bm@smtp156.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 99_5Wr0VM1n7URZQdqMoDesW950wRlnQbKYndAGsr9z2zXk giB_tZ0la159K2lvKZnwgMwHUWt9E40dO770E0pAcctwbGLL21_FJfqknqd8 O7VZX211GZ9rRfivlLdQkdCxdSwEH8eJrj5St_6JBtGLpFbF2SrLUd_wC.VK cSienJ8.KLiareofO2aiTPloo5oGuWIx8XZmwQK2vcQE.oMJo5.WpVDC7kLC uKZA58S1EwyFt7hzgGK5TPOpjIbIsv1g6xZH2Gfo7eRMZwJ2EsHwnH2armHg 8E5gZUgaLHdUT6wDUVP71i1YKDsEVvtSAo90hhnGdlY79WlQt8BySf9A24bf mcdOkbI0FoM30QKkUZSjHJolrRe7jsBen1hy1f20F7zDMg8Mn5A9msI.X00t 4Cee3 X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@119.236.110.45 with plain) by smtp156.mail.ukl.yahoo.com with SMTP; 17 Mar 2012 00:29:13 -0700 PDT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 17 Mar 2012 15:28:32 +0800 Message-Id: <1331969315-27535-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.9.1 Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 1/4] batman-adv: prepare lq_update_lock to be shared among different protocols 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: Sat, 17 Mar 2012 07:29:15 -0000 Signed-off-by: Marek Lindner --- bat_iv_ogm.c | 9 ++++----- originator.c | 1 + types.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 85617c4..fa41307 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -43,7 +43,6 @@ static struct neigh_node *bat_iv_ogm_neigh_new(struct hard_iface *hard_iface, goto out; INIT_LIST_HEAD(&neigh_node->bonding_list); - spin_lock_init(&neigh_node->tq_lock); neigh_node->orig_node = orig_neigh; neigh_node->if_incoming = hard_iface; @@ -638,12 +637,12 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv, if (is_duplicate) continue; - spin_lock_bh(&tmp_neigh_node->tq_lock); + spin_lock_bh(&tmp_neigh_node->lq_update_lock); ring_buffer_set(tmp_neigh_node->tq_recv, &tmp_neigh_node->tq_index, 0); tmp_neigh_node->tq_avg = ring_buffer_avg(tmp_neigh_node->tq_recv); - spin_unlock_bh(&tmp_neigh_node->tq_lock); + spin_unlock_bh(&tmp_neigh_node->lq_update_lock); } if (!neigh_node) { @@ -669,12 +668,12 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv, orig_node->flags = batman_ogm_packet->flags; neigh_node->last_seen = jiffies; - spin_lock_bh(&neigh_node->tq_lock); + spin_lock_bh(&neigh_node->lq_update_lock); ring_buffer_set(neigh_node->tq_recv, &neigh_node->tq_index, batman_ogm_packet->tq); neigh_node->tq_avg = ring_buffer_avg(neigh_node->tq_recv); - spin_unlock_bh(&neigh_node->tq_lock); + spin_unlock_bh(&neigh_node->lq_update_lock); if (!is_duplicate) { orig_node->last_ttl = batman_ogm_packet->header.ttl; diff --git a/originator.c b/originator.c index 4432d64..30889c9 100644 --- a/originator.c +++ b/originator.c @@ -99,6 +99,7 @@ struct neigh_node *neigh_node_new(struct hard_iface *hard_iface, INIT_HLIST_NODE(&neigh_node->list); memcpy(neigh_node->addr, neigh_addr, ETH_ALEN); + spin_lock_init(&neigh_node->lq_update_lock); /* extra reference for return */ atomic_set(&neigh_node->refcount, 2); diff --git a/types.h b/types.h index 04d6cf5..15f538a 100644 --- a/types.h +++ b/types.h @@ -151,7 +151,7 @@ struct neigh_node { struct rcu_head rcu; struct orig_node *orig_node; struct hard_iface *if_incoming; - spinlock_t tq_lock; /* protects: tq_recv, tq_index */ + spinlock_t lq_update_lock; /* protects: tq_recv, tq_index */ }; #ifdef CONFIG_BATMAN_ADV_BLA