diff --git a/[refs] b/[refs] index aae3ac494b9b..c6d44490eb25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db0fd97c270f1e80321f7ae55234643ca0978c54 +refs/heads/master: 903788892ea0fc7fcaf7e8e5fac9a77379fc215b diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h index 05f332afc9e0..8317ec4b9f3b 100644 --- a/trunk/include/linux/kernel.h +++ b/trunk/include/linux/kernel.h @@ -375,6 +375,8 @@ static inline char *pack_hex_byte(char *buf, u8 byte) return buf; } +extern int hex_to_bin(char ch); + #ifndef pr_fmt #define pr_fmt(fmt) fmt #endif diff --git a/trunk/lib/hexdump.c b/trunk/lib/hexdump.c index 1bd6a9779774..5d7a4802c562 100644 --- a/trunk/lib/hexdump.c +++ b/trunk/lib/hexdump.c @@ -15,6 +15,24 @@ const char hex_asc[] = "0123456789abcdef"; EXPORT_SYMBOL(hex_asc); +/** + * hex_to_bin - convert a hex digit to its real value + * @ch: ascii character represents hex digit + * + * hex_to_bin() converts one hex digit to its actual value or -1 in case of bad + * input. + */ +int hex_to_bin(char ch) +{ + if ((ch >= '0') && (ch <= '9')) + return ch - '0'; + ch = tolower(ch); + if ((ch >= 'a') && (ch <= 'f')) + return ch - 'a' + 10; + return -1; +} +EXPORT_SYMBOL(hex_to_bin); + /** * hex_dump_to_buffer - convert a blob of data to "hex ASCII" in memory * @buf: data blob to dump