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

batman-adv: Fix kernel panic when fetching vis data on a vis server

Commit 593180d8b00bd486187841468adb53ca1edf3950 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@personaltelco.net Signed-off-by: Linus Lüssing linus.luessing@web.de

diff --git a/vis.c b/vis.c index 69178d9..2cdf01c 100644 --- a/vis.c +++ b/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);