From: Christian Lamparter <chunkeey@googlemail.com>
Date: Mon, 28 Feb 2011 19:07:48 +0000 (+0100)
Subject: Merge http://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw
X-Git-Tag: 1.9.4~27
X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=commitdiff_plain;h=985f1f6849ec65147405763e9bb6c0e55ffcb789;hp=d496f07eeee98f74d6aba3f7db5671d06864ed52

Merge git./pub/scm/linux/kernel/git/chr/carl9170fw
---

diff --git a/carlfw/Kconfig b/carlfw/Kconfig
index 3b7de61..1c5718a 100644
--- a/carlfw/Kconfig
+++ b/carlfw/Kconfig
@@ -158,7 +158,7 @@ config CARL9170FW_WOL_PROBE_REQUEST
 	def_bool n
 	prompt "Probe Request"
 	depends on CARL9170FW_WOL_OPTION
-	select CARL9170FW_WOL_CHECK
+	select CARL9170FW_WOL
 	---help---
 	 Scan probe requests for a given SSID.
 
diff --git a/tools/carlu/src/debug.c b/tools/carlu/src/debug.c
index 7ba573f..f8d6372 100644
--- a/tools/carlu/src/debug.c
+++ b/tools/carlu/src/debug.c
@@ -73,7 +73,7 @@ void print_hex_dump_bytes(const enum debug_level_t lvl, const char *pre,
 	char str[17] = { 0 };
 	const unsigned char *tmp = (void *) buf;
 	char *pbuf = line;
-	size_t i;
+	size_t i, j;
 
 	for (i = 0; i < len; i++) {
 		if (i % 16 == 0) {
@@ -92,7 +92,7 @@ void print_hex_dump_bytes(const enum debug_level_t lvl, const char *pre,
 		if ((i % 16)) {
 			str[i % 16] = '\0';
 
-			for (i = 0; i < (16 - (i % 16)); i++)
+			for (j = 0; j < (16 - (i % 16)); j++)
 				pbuf += sprintf(pbuf, "   ");
 		}