[linux-next] LinuxNextTracking branch, master, updated. next-20110624

batman at open-mesh.org batman at open-mesh.org
Fri Jun 24 16:08:50 CEST 2011


The following commit has been merged in the master branch:
commit dd58ddc6928f711d8fb7101182215a0f23cf41f1
Author: Linus Lüssing <linus.luessing at web.de>
Date:   Tue Jan 25 21:56:16 2011 +0000

    batman-adv: Fix kernel panic when fetching vis data on a vis server
    
    The hash_iterate removal introduced a bug leading to a kernel panic when
    fetching the vis data on a vis server. That commit forgot to rename one
    variable name, which this commit fixes now.
    
    Reported-by: Russell Senior <russell at personaltelco.net>
    Signed-off-by: Linus Lüssing <linus.luessing at web.de>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index cd4c423..f69a374 100644
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@ -268,10 +268,10 @@ int vis_seq_print_text(struct seq_file *seq, void *offset)
 				buff_pos += sprintf(buff + buff_pos, "%pM,",
 						entry->addr);
 
-				for (i = 0; i < packet->entries; i++)
+				for (j = 0; j < packet->entries; j++)
 					buff_pos += vis_data_read_entry(
 							buff + buff_pos,
-							&entries[i],
+							&entries[j],
 							entry->addr,
 							entry->primary);
 

-- 
LinuxNextTracking


More information about the linux-merge mailing list