The following commit has been merged in the master branch: commit ebcece461a7377e3cb3569cb22357b5ddc80b474 Author: Marek Lindner lindner_marek@yahoo.de Date: Sat Oct 23 15:20:09 2010 +0000

batman-adv: remove obsolete flags variable to avoid kernel warnings

Signed-off-by: Marek Lindner lindner_marek@yahoo.de Acked-by: Sven Eckelmann sven.eckelmann@gmx.de

diff --git a/bat_debugfs.c b/bat_debugfs.c index 11e5f65..934c879 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -57,7 +57,6 @@ static int fdebug_log(struct debug_log *debug_log, char *fmt, ...) va_list args; static char debug_log_buf[256]; char *p; - unsigned long flags;

if (!debug_log) return 0; @@ -113,7 +112,6 @@ static ssize_t log_read(struct file *file, char __user *buf, struct debug_log *debug_log = bat_priv->debug_log; int error, i = 0; char c; - unsigned long flags;

if ((file->f_flags & O_NONBLOCK) && !(debug_log->log_end - debug_log->log_start))