b.a.t.m.a.n.lists.open-mesh.org archive mirror
 help / color / mirror / Atom feed
From: Sven Eckelmann <sven.eckelmann@gmx.de>
To: greg@kroah.com
Cc: b.a.t.m.a.n@lists.open-mesh.net
Subject: [B.A.T.M.A.N.] [PATCH 2/5] Staging: batman-adv: Remove currently unused gw_* datastructures
Date: Sun, 12 Sep 2010 23:21:53 +0200	[thread overview]
Message-ID: <1284326516-30540-3-git-send-email-sven.eckelmann@gmx.de> (raw)
In-Reply-To: <1284326516-30540-1-git-send-email-sven.eckelmann@gmx.de>

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@gmx.de>
---
 drivers/staging/batman-adv/main.c  |    2 --
 drivers/staging/batman-adv/types.h |    3 ---
 2 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/batman-adv/main.c b/drivers/staging/batman-adv/main.c
index b3e23e1..78ceebf 100644
--- a/drivers/staging/batman-adv/main.c
+++ b/drivers/staging/batman-adv/main.c
@@ -84,13 +84,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/drivers/staging/batman-adv/types.h b/drivers/staging/batman-adv/types.h
index e779c4a..9d744d8 100644
--- a/drivers/staging/batman-adv/types.h
+++ b/drivers/staging/batman-adv/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;
 };
 
-- 
1.7.2.3


  parent reply	other threads:[~2010-09-12 21:21 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-12 21:21 [B.A.T.M.A.N.] Staging: batman-adv for 2.6.37 (2) Sven Eckelmann
2010-09-12 21:21 ` [B.A.T.M.A.N.] [PATCH 1/5] Staging: batman-adv: Always synchronize rcu's on module shutdown Sven Eckelmann
2010-09-12 21:21 ` Sven Eckelmann [this message]
2010-09-12 21:21 ` [B.A.T.M.A.N.] [PATCH 3/5] Staging: batman-adv: Add rcu TODO Sven Eckelmann
2010-09-12 21:21 ` [B.A.T.M.A.N.] [PATCH 4/5] Staging: batman-adv: removing redundant assignment of skb->dev Sven Eckelmann
2010-09-12 21:21 ` [B.A.T.M.A.N.] [PATCH 5/5] Staging: batman-adv: check kmalloc() return value Sven Eckelmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1284326516-30540-3-git-send-email-sven.eckelmann@gmx.de \
    --to=sven.eckelmann@gmx.de \
    --cc=b.a.t.m.a.n@lists.open-mesh.net \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    --cc=greg@kroah.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).