projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'net-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev...
[linux-2.6-microblaze.git]
/
drivers
/
staging
/
octeon
/
ethernet.c
diff --git
a/drivers/staging/octeon/ethernet.c
b/drivers/staging/octeon/ethernet.c
index
7c60b0c
..
dcbba96
100644
(file)
--- a/
drivers/staging/octeon/ethernet.c
+++ b/
drivers/staging/octeon/ethernet.c
@@
-407,14
+407,10
@@
static int cvm_oct_common_set_mac_address(struct net_device *dev, void *addr)
int cvm_oct_common_init(struct net_device *dev)
{
struct octeon_ethernet *priv = netdev_priv(dev);
int cvm_oct_common_init(struct net_device *dev)
{
struct octeon_ethernet *priv = netdev_priv(dev);
-
const u8 *mac = NULL
;
+
int ret
;
- if (priv->of_node)
- mac = of_get_mac_address(priv->of_node);
-
- if (!IS_ERR_OR_NULL(mac))
- ether_addr_copy(dev->dev_addr, mac);
- else
+ ret = of_get_mac_address(priv->of_node, dev->dev_addr);
+ if (ret)
eth_hw_addr_random(dev);
/*
eth_hw_addr_random(dev);
/*