[commits] batman-adv branch, next, updated. v2010.1.0-25-g3faffe9

postmaster at open-mesh.net postmaster at open-mesh.net
Wed Sep 8 01:18:02 CEST 2010


The following commit has been merged in the next branch:
commit 3faffe95d0c1221b746fe83bb61a2ad303aab47d
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Tue Sep 7 11:37:50 2010 +0200

    batman-adv: Remove currently unused gw_* datastructures
    
    gw_list_lock, gw_list and curr_gw are currently unused members of struct
    bat_priv. They will be readded when gateway support is really
    implemented.
    
    Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>

diff --git a/main.c b/main.c
index 92ce4f2..c9d3be5 100644
--- a/main.c
+++ b/main.c
@@ -85,13 +85,11 @@ int mesh_init(struct net_device *soft_iface)
 	spin_lock_init(&bat_priv->forw_bcast_list_lock);
 	spin_lock_init(&bat_priv->hna_lhash_lock);
 	spin_lock_init(&bat_priv->hna_ghash_lock);
-	spin_lock_init(&bat_priv->gw_list_lock);
 	spin_lock_init(&bat_priv->vis_hash_lock);
 	spin_lock_init(&bat_priv->vis_list_lock);
 
 	INIT_HLIST_HEAD(&bat_priv->forw_bat_list);
 	INIT_HLIST_HEAD(&bat_priv->forw_bcast_list);
-	INIT_HLIST_HEAD(&bat_priv->gw_list);
 
 	if (originator_init(bat_priv) < 1)
 		goto err;
diff --git a/types.h b/types.h
index e779c4a..9d744d8 100644
--- a/types.h
+++ b/types.h
@@ -128,7 +128,6 @@ struct bat_priv {
 	struct dentry *debug_dir;
 	struct hlist_head forw_bat_list;
 	struct hlist_head forw_bcast_list;
-	struct hlist_head gw_list;
 	struct list_head vis_send_list;
 	struct hashtable_t *orig_hash;
 	struct hashtable_t *hna_local_hash;
@@ -139,7 +138,6 @@ struct bat_priv {
 	spinlock_t forw_bcast_list_lock;
 	spinlock_t hna_lhash_lock;
 	spinlock_t hna_ghash_lock;
-	spinlock_t gw_list_lock;
 	spinlock_t vis_hash_lock;
 	spinlock_t vis_list_lock;
 	int16_t num_local_hna;
@@ -147,7 +145,6 @@ struct bat_priv {
 	struct delayed_work hna_work;
 	struct delayed_work orig_work;
 	struct delayed_work vis_work;
-	struct gw_node *curr_gw;
 	struct vis_info *my_vis_info;
 };
 

-- 
batman-adv


More information about the commits mailing list