Merge http://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw

diff --git a/carlfw/Kconfig b/carlfw/Kconfig
index 3b7de610cc3fd2b2e27c861a92fe3d99afa70fd0..1c5718ae60caa986ce1107e07043814dce4ced12 100644 (file)
--- 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 7ba573f396c5e68fdc20e319f89c62a335018b46..f8d6372c5afa184b39100a9bec55b32112f67152 100644 (file)
--- 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, "   ");
                }