|
@@ -44,6 +44,7 @@
|
|
|
#include <linux/usb.h>
|
|
|
#include <linux/usb/usbnet.h>
|
|
|
#include <linux/slab.h>
|
|
|
+#include <linux/kernel.h>
|
|
|
|
|
|
#define DRIVER_VERSION "22-Aug-2005"
|
|
|
|
|
@@ -158,16 +159,6 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf)
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(usbnet_get_endpoints);
|
|
|
|
|
|
-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;
|
|
|
-}
|
|
|
-
|
|
|
int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress)
|
|
|
{
|
|
|
int tmp, i;
|
|
@@ -183,7 +174,7 @@ int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress)
|
|
|
}
|
|
|
for (i = tmp = 0; i < 6; i++, tmp += 2)
|
|
|
dev->net->dev_addr [i] =
|
|
|
- (nibble(buf [tmp]) << 4) + nibble(buf [tmp + 1]);
|
|
|
+ (hex_to_bin(buf[tmp]) << 4) + hex_to_bin(buf[tmp + 1]);
|
|
|
return 0;
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr);
|