The following commit has been merged in the linux branch: commit bc0ad071a788625abb23aee4cb3c07d17d501641 Author: Marek Lindner lindner_marek@yahoo.de Date: Fri Feb 19 16:18:07 2010 +0100

Staging: batman-adv: remove obsolete variables

This patch removes a variable that became obsolete since the skb handling replaced the packet handling thread.

Signed-off-by: Marek Lindner lindner_marek@yahoo.de Signed-off-by: Andrew Lunn andrew@lunn.ch Signed-off-by: Greg Kroah-Hartman gregkh@suse.de

diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c index 8abaa61..7dc9aef 100644 --- a/drivers/staging/batman-adv/routing.c +++ b/drivers/staging/batman-adv/routing.c @@ -35,8 +35,6 @@

DECLARE_WAIT_QUEUE_HEAD(thread_wait);

-atomic_t exit_cond; - void slide_own_bcast_window(struct batman_if *batman_if) { HASHIT(hashit); diff --git a/drivers/staging/batman-adv/routing.h b/drivers/staging/batman-adv/routing.h index c217241..939b8d4 100644 --- a/drivers/staging/batman-adv/routing.h +++ b/drivers/staging/batman-adv/routing.h @@ -22,7 +22,6 @@ #include "types.h"

extern wait_queue_head_t thread_wait; -extern atomic_t exit_cond;

void slide_own_bcast_window(struct batman_if *batman_if); void receive_bat_packet(struct ethhdr *ethhdr,