net/ncsi: change from ndo_set_mac_address to dev_set_mac_address
authorIvan Mikhaylov <fr0st61te@gmail.com>
Wed, 7 Jun 2023 15:17:42 +0000 (18:17 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 23 Jul 2023 11:49:51 +0000 (13:49 +0200)
commit 790071347a0a1a89e618eedcd51c687ea783aeb3 upstream.

Change ndo_set_mac_address to dev_set_mac_address because
dev_set_mac_address provides a way to notify network layer about MAC
change. In other case, services may not aware about MAC change and keep
using old one which set from network adapter driver.

As example, DHCP client from systemd do not update MAC address without
notification from net subsystem which leads to the problem with acquiring
the right address from DHCP server.

Fixes: cb10c7c0dfd9e ("net/ncsi: Add NCSI Broadcom OEM command")
Cc: stable@vger.kernel.org # v6.0+ 2f38e84 net/ncsi: make one oem_gma function for all mfr id
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: Ivan Mikhaylov <fr0st61te@gmail.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ncsi/ncsi-rsp.c

index 91c4225..069c265 100644 (file)
@@ -616,7 +616,6 @@ static int ncsi_rsp_handler_oem_gma(struct ncsi_request *nr, int mfr_id)
 {
        struct ncsi_dev_priv *ndp = nr->ndp;
        struct net_device *ndev = ndp->ndev.dev;
-       const struct net_device_ops *ops = ndev->netdev_ops;
        struct ncsi_rsp_oem_pkt *rsp;
        struct sockaddr saddr;
        u32 mac_addr_off = 0;
@@ -643,7 +642,9 @@ static int ncsi_rsp_handler_oem_gma(struct ncsi_request *nr, int mfr_id)
        /* Set the flag for GMA command which should only be called once */
        ndp->gma_flag = 1;
 
-       ret = ops->ndo_set_mac_address(ndev, &saddr);
+       rtnl_lock();
+       ret = dev_set_mac_address(ndev, &saddr, NULL);
+       rtnl_unlock();
        if (ret < 0)
                netdev_warn(ndev, "NCSI: 'Writing mac address to device failed\n");