[1/8] batman-adv: remove redundant gw_node_list_free() function
Commit Message
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
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(-)
@@ -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);
}
@@ -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);
@@ -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);
@@ -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);