net/ncsi: use dev_set_mac_address() for Get MC MAC Address handling

Copy of the rationale from 790071347a0a1a89e618eedcd51c687ea783aeb3:

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.

Since dev_set_mac_address requires RTNL lock the operation can not be
performed directly in the response handler, see
9e2bbab94b88295dcc57c7580393c9ee08d7314d.

The way of selecting the first suitable MAC address from the list is
changed, instead of having the driver check it this patch just assumes
any valid MAC should be good.

Fixes: b8291cf3d118 ("net/ncsi: Add NC-SI 1.2 Get MC MAC Address command")
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c
index 14bd66909ca4553b92f04c6308bd7630dbd8c653..4a8ce2949faeac1b44f30f127edc86e0d4e0cb22 100644 (file)
--- a/net/ncsi/ncsi-rsp.c
+++ b/net/ncsi/ncsi-rsp.c
@@ -1089,14 +1089,12 @@ static int ncsi_rsp_handler_netlink(struct ncsi_request *nr)
 static int ncsi_rsp_handler_gmcma(struct ncsi_request *nr)
 {
        struct ncsi_dev_priv *ndp = nr->ndp;
+       struct sockaddr *saddr = &ndp->pending_mac;
        struct net_device *ndev = ndp->ndev.dev;
        struct ncsi_rsp_gmcma_pkt *rsp;
-       struct sockaddr saddr;
-       int ret = -1;
        int i;
 
        rsp = (struct ncsi_rsp_gmcma_pkt *)skb_network_header(nr->rsp);
-       saddr.sa_family = ndev->type;
        ndev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
 
        netdev_info(ndev, "NCSI: Received %d provisioned MAC addresses\n",
@@ -1108,20 +1106,20 @@ static int ncsi_rsp_handler_gmcma(struct ncsi_request *nr)
                            rsp->addresses[i][4], rsp->addresses[i][5]);
        }
 
+       saddr->sa_family = ndev->type;
        for (i = 0; i < rsp->address_count; i++) {
-               memcpy(saddr.sa_data, &rsp->addresses[i], ETH_ALEN);
-               ret = ndev->netdev_ops->ndo_set_mac_address(ndev, &saddr);
-               if (ret < 0) {
+               if (!is_valid_ether_addr(rsp->addresses[i])) {
                        netdev_warn(ndev, "NCSI: Unable to assign %pM to device\n",
-                                   saddr.sa_data);
+                                   rsp->addresses[i]);
                        continue;
                }
-               netdev_warn(ndev, "NCSI: Set MAC address to %pM\n", saddr.sa_data);
+               memcpy(saddr->sa_data, rsp->addresses[i], ETH_ALEN);
+               netdev_warn(ndev, "NCSI: Will set MAC address to %pM\n", saddr->sa_data);
                break;
        }
 
-       ndp->gma_flag = ret == 0;
-       return ret;
+       ndp->gma_flag = 1;
+       return 0;
 }
 
 static struct ncsi_rsp_handler {