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

Message ID 1295992169-3797-1-git-send-email-linus.luessing@web.de (mailing list archive)
State Accepted, archived
Headers

Commit Message

Linus Lüssing Jan. 25, 2011, 9:49 p.m. UTC
  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>
---
 vis.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
  

Comments

Marek Lindner Jan. 25, 2011, 9:54 p.m. UTC | #1
On Tuesday 25 January 2011 22:49:29 Linus Lüssing wrote:
> 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.

Applied in revision 1914.

Thanks,
Marek
  

Patch

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