mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
of: net: add a helper for loading netdev->dev_addr
Commit 406f42fa0d
("net-next: When a bond have a massive amount
of VLANs...") introduced a rbtree for faster Ethernet address look
up. To maintain netdev->dev_addr in this tree we need to make all
the writes to it got through appropriate helpers.
There are roughly 40 places where netdev->dev_addr is passed
as the destination to a of_get_mac_address() call. Add a helper
which takes a dev pointer instead, so it can call an appropriate
helper.
Note that of_get_mac_address() already assumes the address is
6 bytes long (ETH_ALEN) so use eth_hw_addr_set().
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e330fb1459
commit
d466effe28
2 changed files with 31 additions and 0 deletions
|
@ -14,6 +14,7 @@
|
||||||
struct net_device;
|
struct net_device;
|
||||||
extern int of_get_phy_mode(struct device_node *np, phy_interface_t *interface);
|
extern int of_get_phy_mode(struct device_node *np, phy_interface_t *interface);
|
||||||
extern int of_get_mac_address(struct device_node *np, u8 *mac);
|
extern int of_get_mac_address(struct device_node *np, u8 *mac);
|
||||||
|
int of_get_ethdev_address(struct device_node *np, struct net_device *dev);
|
||||||
extern struct net_device *of_find_net_device_by_node(struct device_node *np);
|
extern struct net_device *of_find_net_device_by_node(struct device_node *np);
|
||||||
#else
|
#else
|
||||||
static inline int of_get_phy_mode(struct device_node *np,
|
static inline int of_get_phy_mode(struct device_node *np,
|
||||||
|
@ -27,6 +28,11 @@ static inline int of_get_mac_address(struct device_node *np, u8 *mac)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline int of_get_ethdev_address(struct device_node *np, struct net_device *dev)
|
||||||
|
{
|
||||||
|
return -ENODEV;
|
||||||
|
}
|
||||||
|
|
||||||
static inline struct net_device *of_find_net_device_by_node(struct device_node *np)
|
static inline struct net_device *of_find_net_device_by_node(struct device_node *np)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -143,3 +143,28 @@ int of_get_mac_address(struct device_node *np, u8 *addr)
|
||||||
return of_get_mac_addr_nvmem(np, addr);
|
return of_get_mac_addr_nvmem(np, addr);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(of_get_mac_address);
|
EXPORT_SYMBOL(of_get_mac_address);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* of_get_ethdev_address()
|
||||||
|
* @np: Caller's Device Node
|
||||||
|
* @dev: Pointer to netdevice which address will be updated
|
||||||
|
*
|
||||||
|
* Search the device tree for the best MAC address to use.
|
||||||
|
* If found set @dev->dev_addr to that address.
|
||||||
|
*
|
||||||
|
* See documentation of of_get_mac_address() for more information on how
|
||||||
|
* the best address is determined.
|
||||||
|
*
|
||||||
|
* Return: 0 on success and errno in case of error.
|
||||||
|
*/
|
||||||
|
int of_get_ethdev_address(struct device_node *np, struct net_device *dev)
|
||||||
|
{
|
||||||
|
u8 addr[ETH_ALEN];
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = of_get_mac_address(np, addr);
|
||||||
|
if (!ret)
|
||||||
|
eth_hw_addr_set(dev, addr);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(of_get_ethdev_address);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue