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

Commit 03ad032b authored by Peter Holik's avatar Peter Holik Committed by David S. Miller
Browse files

export usbnet_get_ethernet_addr from usbnet and fixed cdc_ether.c 



because of using the same function get_ethernet_addr as cdc_ether.c
i export usbnet_get_ethernet_addr from usbnet and fixed cdc_ether
(suggested by Oliver Neukum).

Signed-off-by: default avatarPeter Holik <peter@holik.at>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bb9e63e2

drivers/net/usb/cdc_ether.c

+1 −32
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/init.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/ctype.h>

#include <linux/ethtool.h>

#include <linux/workqueue.h>

#include <linux/mii.h>
@@ -389,36 +388,6 @@ static void cdc_status(struct usbnet *dev, struct urb *urb) 
	}

}



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;

}



static inline int

get_ethernet_addr(struct usbnet *dev, struct usb_cdc_ether_desc *e)

{

	int 		tmp, i;

	unsigned char	buf [13];



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

	if (tmp != 12) {

		dev_dbg(&dev->udev->dev,

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

		if (tmp >= 0)

			tmp = -EINVAL;

		return tmp;

	}

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

		dev->net->dev_addr [i] =

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

	return 0;

}



static int cdc_bind(struct usbnet *dev, struct usb_interface *intf)

{

	int				status;
@@ -428,7 +397,7 @@ static int cdc_bind(struct usbnet *dev, struct usb_interface *intf) 
	if (status < 0)

		return status;



	status = get_ethernet_addr(dev, info->ether);

	status = usbnet_get_ethernet_addr(dev, info->ether->iMACAddress);

	if (status < 0) {

		usb_set_intfdata(info->data, NULL);

		usb_driver_release_interface(driver_of(intf), info->data);

drivers/net/usb/usbnet.c

+31 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/init.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/ctype.h>

#include <linux/ethtool.h>

#include <linux/workqueue.h>

#include <linux/mii.h>
@@ -156,6 +157,36 @@ 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;

	unsigned char	buf [13];



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

	if (tmp != 12) {

		dev_dbg(&dev->udev->dev,

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

		if (tmp >= 0)

			tmp = -EINVAL;

		return tmp;

	}

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

		dev->net->dev_addr [i] =

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

	return 0;

}

EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr);



static void intr_complete (struct urb *urb);



static int init_status (struct usbnet *dev, struct usb_interface *intf)

include/linux/usb/usbnet.h

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ extern void usbnet_tx_timeout (struct net_device *net); 
extern int usbnet_change_mtu (struct net_device *net, int new_mtu);



extern int usbnet_get_endpoints(struct usbnet *, struct usb_interface *);

extern int usbnet_get_ethernet_addr(struct usbnet *, int);

extern void usbnet_defer_kevent (struct usbnet *, int);

extern void usbnet_skb_return (struct usbnet *, struct sk_buff *);

extern void usbnet_unlink_rx_urbs(struct usbnet *);