diff options
| author | Badhri Jagan Sridharan <Badhri@google.com> | 2016-06-27 13:33:59 -0700 |
|---|---|---|
| committer | Badhri Jagan Sridharan <badhri@google.com> | 2016-06-28 23:33:24 +0000 |
| commit | e639a4e74d6cd2c01d4f2afbbe0b6e6e233b42d2 (patch) | |
| tree | ec7e935133b9c7c2236e3bee245eeb593d88a994 /drivers/usb/gadget/function | |
| parent | ef51a2254d6579560bf7ff8ebbeb9b3848fe10bf (diff) | |
Revert "usb: gadget: prevent change of Host MAC address of 'usb0' interface"
This reverts commit 265801537d110eb68d44a2f66015479908f635c0.
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Diffstat (limited to 'drivers/usb/gadget/function')
| -rw-r--r-- | drivers/usb/gadget/function/u_ether.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c index dd73dfe5dcab..74e9f5b5a45d 100644 --- a/drivers/usb/gadget/function/u_ether.c +++ b/drivers/usb/gadget/function/u_ether.c @@ -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) { if (str) { @@ -895,17 +893,6 @@ static int get_ether_addr_str(u8 dev_addr[ETH_ALEN], char *str, int len) 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 = { .ndo_open = eth_open, .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)) dev_warn(&g->dev, "using random %s ethernet address\n", "self"); - - if (get_host_ether_addr(host_ethaddr, dev->host_mac)) - dev_warn(&g->dev, "using random %s ethernet address\n", "host"); - else - dev_warn(&g->dev, "using previous %s ethernet address\n", "host"); + if (get_ether_addr(host_addr, dev->host_mac)) + dev_warn(&g->dev, + "using random %s ethernet address\n", "host"); if (ethaddr) memcpy(ethaddr, dev->host_mac, ETH_ALEN); |