Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51487ae7 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller
Browse files

usbnet: re-use native hex2bin() 



Call hex2bin() library function, instead of doing conversion here.

Signed-off-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bc0247a4

drivers/net/usb/usbnet.c

+8 −9
Original line number Diff line number Diff line
@@ -160,20 +160,19 @@ EXPORT_SYMBOL_GPL(usbnet_get_endpoints); 


int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress)

{

	int 		tmp, i;

	int 		tmp = -1, ret;

	unsigned char	buf [13];



	tmp = usb_string(dev->udev, iMACAddress, buf, sizeof buf);

	if (tmp != 12) {

	ret = usb_string(dev->udev, iMACAddress, buf, sizeof buf);

	if (ret == 12)

		tmp = hex2bin(dev->net->dev_addr, buf, 6);

	if (tmp < 0) {

		dev_dbg(&dev->udev->dev,

			"bad MAC string %d fetch, %d\n", iMACAddress, tmp);

		if (tmp >= 0)

			tmp = -EINVAL;

		return tmp;

		if (ret >= 0)

			ret = -EINVAL;

		return ret;

	}

	for (i = tmp = 0; i < 6; i++, tmp += 2)

		dev->net->dev_addr [i] =

			(hex_to_bin(buf[tmp]) << 4) + hex_to_bin(buf[tmp + 1]);

	return 0;

}

EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr);