]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ethernet: rocker: use eth_hw_addr_set()
authorJakub Kicinski <kuba@kernel.org>
Mon, 18 Oct 2021 14:29:27 +0000 (07:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Oct 2021 11:41:47 +0000 (12:41 +0100)
Commit 406f42fa0d3c ("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.

Read the address into an array on the stack, then call
eth_hw_addr_set().

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/rocker/rocker_main.c

index f28c0c36b6069300b07e5abf59a7364eb8e0dbcb..ba4062881eed172e6ec1b7ec0d43bc2e839b4a92 100644 (file)
@@ -2545,11 +2545,13 @@ static void rocker_port_dev_addr_init(struct rocker_port *rocker_port)
 {
        const struct rocker *rocker = rocker_port->rocker;
        const struct pci_dev *pdev = rocker->pdev;
+       u8 addr[ETH_ALEN];
        int err;
 
-       err = rocker_cmd_get_port_settings_macaddr(rocker_port,
-                                                  rocker_port->dev->dev_addr);
-       if (err) {
+       err = rocker_cmd_get_port_settings_macaddr(rocker_port, addr);
+       if (!err) {
+               eth_hw_addr_set(rocker_port->dev, addr);
+       } else {
                dev_warn(&pdev->dev, "failed to get mac address, using random\n");
                eth_hw_addr_random(rocker_port->dev);
        }