eth: fwnode: add a helper for loading netdev->dev_addr

Commit 09f15be0aa1e ("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 is a handful of drivers which pass netdev->dev_addr as
the destination buffer to device_get_mac_address(). Add a helper
which takes a dev pointer instead, so it can call an appropriate
helper.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index bb612c7382e3dbcd4de291e12330d12979f6bc47..a8bb64cf4079e063d3eaf572d34b8c0e7abbc326 100644 (file)
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -32,6 +32,7 @@ int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr);
 unsigned char *arch_get_platform_mac_address(void);
 int nvmem_get_mac_address(struct device *dev, void *addrbuf);
 int device_get_mac_address(struct device *dev, char *addr);
+int device_get_ethdev_address(struct device *dev, struct net_device *netdev);
 int fwnode_get_mac_address(struct fwnode_handle *fwnode, char *addr);
 
 u32 eth_get_headlen(const struct net_device *dev, const void *data, u32 len);

diff --git a/include/linux/property.h b/include/linux/property.h
index 4fb081684255aab3aa79623b56ec4aca54e91568..88fa726a76df7db5a7081343d87c3c3c79d7c445 100644 (file)
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -15,6 +15,7 @@
 #include <linux/types.h>
 
 struct device;
+struct net_device;
 
 enum dev_prop_type {
        DEV_PROP_U8,

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 29447a61d3ec96b035a3104a29e846e214f82086..d7b8fa10fabb266071eb05d7ecb0ab03a5d6c6fe 100644 (file)
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -617,3 +617,23 @@ int device_get_mac_address(struct device *dev, char *addr)
        return fwnode_get_mac_address(dev_fwnode(dev), addr);
 }
 EXPORT_SYMBOL(device_get_mac_address);
+
+/**
+ * device_get_ethdev_address - Set netdev's MAC address from a given device
+ * @dev:       Pointer to the device
+ * @netdev:    Pointer to netdev to write the address to
+ *
+ * Wrapper around device_get_mac_address() which writes the address
+ * directly to netdev->dev_addr.
+ */
+int device_get_ethdev_address(struct device *dev, struct net_device *netdev)
+{
+       u8 addr[ETH_ALEN];
+       int ret;
+
+       ret = device_get_mac_address(dev, addr);
+       if (!ret)
+               eth_hw_addr_set(netdev, addr);
+       return ret;
+}
+EXPORT_SYMBOL(device_get_ethdev_address);