[PATCH 2.6.25] compilation fix for drivers/net/wireless/libertas/debugfs.c

[PATCH 2.6.25] compilation fix for drivers/net/wireless/libertas/debugfs.c

[Denis V. Lunev]

Compilation fix. MAC_FMT is required for
drivers/net/wireless/libertas/debugfs.c

The problem has been introduced by the
commit 4b326fa2167d4ee2d722bff4e241fae299e32442
Author: Michael Chan <mchan@broadcom.com>
Date:   Mon Dec 24 21:28:09 2007 -0800

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 7a1e011..2928586 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -129,6 +129,7 @@ extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len);
 /*
  *	Display a 6 byte device address (MAC) in a readable format.
  */
+#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
 extern char *print_mac(char *buf, const unsigned char *addr);
 #define MAC_BUF_SIZE	18
 #define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE] __maybe_unused

Re: [PATCH 2.6.25] compilation fix for drivers/net/wireless/libertas/debugfs.c

[David Miller]

From: "Denis V. Lunev" <den@openvz.org>
Date: Thu, 27 Dec 2007 13:24:54 +0300

> Compilation fix. MAC_FMT is required for
> drivers/net/wireless/libertas/debugfs.c

Putting this public macro back into a header file just
for one driver's debug handling is just rediculious.

I've checked in the following fix instead, thanks.

commit f7b4d3b86615b95b104ca0a95902ca86373a6548
Author: David S. Miller <davem@davemloft.net>
Date:   Thu Dec 27 16:43:38 2007 -0800

    [LIBERTAS]: Remove last stray user of MAC_FMT.
    
    Reported by Denis V. Lunev
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 0bda0b5..95dd4ed 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -243,7 +243,8 @@ static void libertas_parse_bssid(char *buf, size_t count,
 	if (!hold)
 		return;
 	hold += 6;
-	sscanf(hold, MAC_FMT, mac, mac+1, mac+2, mac+3, mac+4, mac+5);
+	sscanf(hold, "%02x:%02x:%02x:%02x:%02x:%02x",
+	       mac, mac+1, mac+2, mac+3, mac+4, mac+5);
 	memcpy(scan_cfg->bssid, mac, ETH_ALEN);
 }