From patchwork Thu Nov 4 17:20:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 519 Return-Path: Received: from nm6.bullet.mail.ukl.yahoo.com (nm6.bullet.mail.ukl.yahoo.com [217.146.182.227]) by open-mesh.org (Postfix) with SMTP id 95EF4154525 for ; Thu, 4 Nov 2010 18:23:20 +0100 (CET) Received: from [217.146.183.181] by nm6.bullet.mail.ukl.yahoo.com with NNFMP; 04 Nov 2010 17:23:20 -0000 Received: from [217.146.183.174] by tm12.bullet.mail.ukl.yahoo.com with NNFMP; 04 Nov 2010 17:23:20 -0000 Received: from [127.0.0.1] by omp1015.mail.ukl.yahoo.com with NNFMP; 04 Nov 2010 17:23:20 -0000 X-Yahoo-Newman-Id: 184181.29220.bm@omp1015.mail.ukl.yahoo.com Received: (qmail 70315 invoked from network); 4 Nov 2010 17:23:20 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.de; h=DKIM-Signature:Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=u1XqXCY8WTxy8aAKUAq7OOAAdYivpUQ8QiWXfRYKF4066w5Lg0EjC5u6MPCay4Gz5oVzZFVNpmXoPQ16sndaqnDobBD0MLNBI65o+99Zk3Bpv+AiPjKiNl0XwIMeCnUHzMTacLU41vJv+n866yfNlerKsV0xRUor9mCwVlQyQZ4= ; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1288891400; bh=863TTOa2ZZDBTjeySmyGHoj+4JaCmTAeSIGeNZaY1F0=; h=Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=nTAwB09SVf5bN64MPcXVfArZMCXCzFNe2qFvjHNwpAxAIu5eX3lPsdT3603+CBspiGLdZZtLZd5utom6okHqkPd55KosjBByr3C8/U6ziMkaDwVV/agsbvOaKdfUKnwgnryZ9RI7HHRjTnAMvkX5s7ejo+6gCI5WGZYRS+V+WcE= Received: from localhost (lindner_marek@78.225.40.81 with plain) by smtp138.mail.ukl.yahoo.com with SMTP; 04 Nov 2010 17:23:19 +0000 GMT X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- X-YMail-OSG: 5xGCVEQVM1kKPKew8ENhJQg9wlzJ0Wp.l34NTAJimBCHfOs dOiUliHHKSv1VVMtKm4lO2i1j8bUfLwer4bX7JACM5354XlcBgm8WvEnZPg5 YwU9BxZEzgoVHnzZThrYmlOiNK4NMSdtdfT0btSBBVr8jphwJQlX.SgxettQ xuUoiOao7ws6.ZIyRh6CI8qnKd6kR8Iy92tXCr10B3P1MEHdfnnV0utljbnR mkcLa97F0px0Q25c_J52nCVOGBNENBfslvFoHu0eei6D9aBVe X-Yahoo-Newman-Property: ymail-3 From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 4 Nov 2010 18:20:58 +0100 Message-Id: <1288891265-16035-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <201011041820.44518.lindner_marek@yahoo.de> References: <201011041820.44518.lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 1/8] batman-adv: remove redundant gw_node_list_free() function X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 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, 04 Nov 2010 17:23:20 -0000 Signed-off-by: Marek Lindner --- batman-adv/gateway_client.c | 30 +++++++++--------------------- batman-adv/gateway_client.h | 3 +-- batman-adv/main.c | 2 +- batman-adv/originator.c | 2 +- 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/batman-adv/gateway_client.c b/batman-adv/gateway_client.c index 24c12b4..e10dc90 100644 --- a/batman-adv/gateway_client.c +++ b/batman-adv/gateway_client.c @@ -305,7 +305,7 @@ void gw_node_delete(struct bat_priv *bat_priv, struct orig_node *orig_node) return gw_node_update(bat_priv, orig_node, 0); } -void gw_node_purge_deleted(struct bat_priv *bat_priv) +void gw_node_purge(struct bat_priv *bat_priv) { struct gw_node *gw_node; struct hlist_node *node, *node_tmp; @@ -314,32 +314,20 @@ void gw_node_purge_deleted(struct bat_priv *bat_priv) spin_lock_bh(&bat_priv->gw_list_lock); hlist_for_each_entry_safe(gw_node, node, node_tmp, - &bat_priv->gw_list, list) { - if ((gw_node->deleted) && - (time_after(jiffies, gw_node->deleted + timeout))) { - - hlist_del_rcu(&gw_node->list); - call_rcu(&gw_node->rcu, gw_node_free_rcu); - } - } - - spin_unlock_bh(&bat_priv->gw_list_lock); -} - -void gw_node_list_free(struct bat_priv *bat_priv) -{ - struct gw_node *gw_node; - struct hlist_node *node, *node_tmp; + &bat_priv->gw_list, list) { + if (((!gw_node->deleted) || + (time_before(jiffies, gw_node->deleted + timeout))) && + atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE) + continue; - spin_lock_bh(&bat_priv->gw_list_lock); + if (bat_priv->curr_gw == gw_node) + gw_deselect(bat_priv); - hlist_for_each_entry_safe(gw_node, node, node_tmp, - &bat_priv->gw_list, list) { hlist_del_rcu(&gw_node->list); call_rcu(&gw_node->rcu, gw_node_free_rcu); } - gw_deselect(bat_priv); + spin_unlock_bh(&bat_priv->gw_list_lock); } diff --git a/batman-adv/gateway_client.h b/batman-adv/gateway_client.h index ce0b4f0..38699ba 100644 --- a/batman-adv/gateway_client.h +++ b/batman-adv/gateway_client.h @@ -29,8 +29,7 @@ void gw_check_election(struct bat_priv *bat_priv, struct orig_node *orig_node); void gw_node_update(struct bat_priv *bat_priv, struct orig_node *orig_node, uint8_t new_gwflags); void gw_node_delete(struct bat_priv *bat_priv, struct orig_node *orig_node); -void gw_node_purge_deleted(struct bat_priv *bat_priv); -void gw_node_list_free(struct bat_priv *bat_priv); +void gw_node_purge(struct bat_priv *bat_priv); int gw_client_seq_print_text(struct seq_file *seq, void *offset); bool gw_is_target(struct bat_priv *bat_priv, struct sk_buff *skb); diff --git a/batman-adv/main.c b/batman-adv/main.c index e4e4eca..c91e635 100644 --- a/batman-adv/main.c +++ b/batman-adv/main.c @@ -132,7 +132,7 @@ void mesh_free(struct net_device *soft_iface) vis_quit(bat_priv); - gw_node_list_free(bat_priv); + gw_node_purge(bat_priv); originator_free(bat_priv); hna_local_free(bat_priv); diff --git a/batman-adv/originator.c b/batman-adv/originator.c index 8930446..89ec021 100644 --- a/batman-adv/originator.c +++ b/batman-adv/originator.c @@ -293,7 +293,7 @@ static void _purge_orig(struct bat_priv *bat_priv) spin_unlock_bh(&bat_priv->orig_hash_lock); - gw_node_purge_deleted(bat_priv); + gw_node_purge(bat_priv); gw_election(bat_priv); softif_neigh_purge(bat_priv);