From d27310fc96d3caf17e7456465e1067d4b5e65e03 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko@gmail.com>
Date: Thu, 22 Jul 2010 19:57:11 +0300
Subject: [PATCH] --- yaml --- r: 205963 b: refs/heads/master c:
 cfa548960dace3c437287464a0bf9d6d106e325c h: refs/heads/master i:   205961:
 3987f74c4e34dffad0663452f14862ad92a36bb3   205959:
 89ff387a612564390aaba5f47fd6568810eb563e v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/wlan-ng/prism2sta.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d289bae4fe3d..8fcc41f50ee8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff290e2307316ccea143ce4a63f4b7394dc36472
+refs/heads/master: cfa548960dace3c437287464a0bf9d6d106e325c
diff --git a/trunk/drivers/staging/wlan-ng/prism2sta.c b/trunk/drivers/staging/wlan-ng/prism2sta.c
index 5ec5741b5eb1..1a502bc4fae8 100644
--- a/trunk/drivers/staging/wlan-ng/prism2sta.c
+++ b/trunk/drivers/staging/wlan-ng/prism2sta.c
@@ -83,8 +83,6 @@
 #include "hfa384x.h"
 #include "prism2mgmt.h"
 
-#define wlan_hexchar(x) (((x) < 0x0a) ? ('0' + (x)) : ('a' + ((x) - 0x0a)))
-
 /* Create a string of printable chars from something that might not be */
 /* It's recommended that the str be 4*len + 1 bytes long */
 #define wlan_mkprintstr(buf, buflen, str, strlen) \
@@ -99,8 +97,8 @@
 		} else { \
 			(str)[j] = '\\'; \
 			(str)[j+1] = 'x'; \
-			(str)[j+2] = wlan_hexchar(((buf)[i] & 0xf0) >> 4); \
-			(str)[j+3] = wlan_hexchar(((buf)[i] & 0x0f)); \
+			(str)[j+2] = hex_asc_hi((buf)[i]); \
+			(str)[j+3] = hex_asc_lo((buf)[i]); \
 			j += 4; \
 		} \
 	} \