>From 7e289c58ed642133e2381369c1067fa30c4c790a Mon Sep 17 00:00:00 2001 From: Kshitij Kulshreshtha Date: Thu, 29 Jul 2010 15:13:27 +0200 Subject: hex_to_bin was added first in 2.6.35 Signed-off-by: Kshitij Kulshreshtha --- drivers/net/usb/usbnet.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 924f9f9..0b7b9c9 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -159,6 +159,18 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf) } EXPORT_SYMBOL_GPL(usbnet_get_endpoints); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) +static u8 nibble(unsigned char c) +{ + if (likely(isdigit(c))) + return c - '0'; + c = toupper(c); + if (likely(isxdigit(c))) + return 10 + c - 'A'; + return 0; +} +#endif + int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress) { int tmp, i; @@ -174,7 +186,11 @@ int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress) } for (i = tmp = 0; i < 6; i++, tmp += 2) dev->net->dev_addr [i] = +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) + (nibble(buf [tmp]) << 4) + nibble(buf [tmp + 1]); +#else (hex_to_bin(buf[tmp]) << 4) + hex_to_bin(buf[tmp + 1]); +#endif return 0; } EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr); -- 1.7.1