diff options
| author | Simon Wunderlich <siwu@hrz.tu-chemnitz.de> | 2010-09-05 01:58:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-05 00:29:44 -0700 |
| commit | 7d02674f71e6369bb125354b23fd0abaa2edfcab (patch) | |
| tree | 4aabb0dbe82f7272974750cf74d449b56201eeaf /drivers/staging/batman-adv/main.c | |
| parent | 8bb22a38d6083d751075829e84421b139dabb460 (diff) | |
| download | op-kernel-dev-7d02674f71e6369bb125354b23fd0abaa2edfcab.zip op-kernel-dev-7d02674f71e6369bb125354b23fd0abaa2edfcab.tar.gz | |
Staging: batman-adv: move queue counters into bat_priv
to support multiple mesh devices later, we need to move global variables
like the queues into corresponding private structs bat_priv of the soft
devices.
Note that this patch still has a lot of FIXMEs and depends on the global
soft_device variable. This should be resolved later, e.g. by referencing
the parent soft device in batman_if.
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
[sven.eckelmann@gmx.de: Rework on top of current version]
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/batman-adv/main.c')
| -rw-r--r-- | drivers/staging/batman-adv/main.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/batman-adv/main.c b/drivers/staging/batman-adv/main.c index ef7c20a..c0a3373 100644 --- a/drivers/staging/batman-adv/main.c +++ b/drivers/staging/batman-adv/main.c @@ -42,9 +42,6 @@ DEFINE_SPINLOCK(orig_hash_lock); DEFINE_SPINLOCK(forw_bat_list_lock); DEFINE_SPINLOCK(forw_bcast_list_lock); -atomic_t bcast_queue_left; -atomic_t batman_queue_left; - int16_t num_hna; struct net_device *soft_device; @@ -69,9 +66,6 @@ static int __init batman_init(void) atomic_set(&module_state, MODULE_INACTIVE); - atomic_set(&bcast_queue_left, BCAST_QUEUE_LEN); - atomic_set(&batman_queue_left, BATMAN_QUEUE_LEN); - /* the name should not be longer than 10 chars - see * http://lwn.net/Articles/23634/ */ bat_event_workqueue = create_singlethread_workqueue("bat_events"); |
