evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "usb: gadget: prevent change of Host MAC address of 'usb0' interface"

Browse source 
This reverts commit 265801537d.

Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
This commit is contained in:
Badhri Jagan Sridharan 2016-06-27 13:33:59 -07:00 • committed by Badhri Jagan Sridharan
parent ef51a2254d
commit e639a4e74d
1 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/usb/gadget/function/u_ether.c
View file

@ -863,8 +863,6 @@ static int eth_stop(struct net_device *net)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static u8 host_ethaddr[ETH_ALEN];
static int get_ether_addr(const char *str, u8 *dev_addr) static int get_ether_addr(const char *str, u8 *dev_addr)
{ {
if (str) { if (str) {
@ -895,17 +893,6 @@ static int get_ether_addr_str(u8 dev_addr[ETH_ALEN], char *str, int len)
return 18; return 18;
} }
static int get_host_ether_addr(u8 *str, u8 *dev_addr)
{
memcpy(dev_addr, str, ETH_ALEN);
if (is_valid_ether_addr(dev_addr))
return 0;
random_ether_addr(dev_addr);
memcpy(str, dev_addr, ETH_ALEN);
return 1;
}
static const struct net_device_ops eth_netdev_ops = { static const struct net_device_ops eth_netdev_ops = {
.ndo_open = eth_open, .ndo_open = eth_open,
.ndo_stop = eth_stop, .ndo_stop = eth_stop,
@ -963,11 +950,9 @@ struct eth_dev *gether_setup_name(struct usb_gadget *g,
if (get_ether_addr(dev_addr, net->dev_addr)) if (get_ether_addr(dev_addr, net->dev_addr))
dev_warn(&g->dev, dev_warn(&g->dev,
"using random %s ethernet address\n", "self"); "using random %s ethernet address\n", "self");
if (get_ether_addr(host_addr, dev->host_mac))
if (get_host_ether_addr(host_ethaddr, dev->host_mac)) dev_warn(&g->dev,
dev_warn(&g->dev, "using random %s ethernet address\n", "host"); "using random %s ethernet address\n", "host");
else
dev_warn(&g->dev, "using previous %s ethernet address\n", "host");
if (ethaddr) if (ethaddr)
memcpy(ethaddr, dev->host_mac, ETH_ALEN); memcpy(ethaddr, dev->host_mac, ETH_ALEN);