Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff652b01 authored by Vijay Khemka's avatar Vijay Khemka Committed by Greg Kroah-Hartman
Browse files

net/ncsi: Fix gma flag setting after response 



[ Upstream commit 9e860947d8d7a1504476ac49abfce90a4ce600f3 ]

gma_flag was set at the time of GMA command request but it should
only be set after getting successful response. Movinng this flag
setting in GMA response handler.

This flag is used mainly for not repeating GMA command once
received MAC address.

Signed-off-by: default avatarVijay Khemka <vijaykhemka@fb.com>
Reviewed-by: default avatarSamuel Mendoza-Jonas <sam@mendozajonas.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: 790071347a0a ("net/ncsi: change from ndo_set_mac_address to dev_set_mac_address")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b66a1def

net/ncsi/ncsi-manage.c

+0 −3
Original line number Diff line number Diff line
@@ -770,9 +770,6 @@ static int ncsi_gma_handler(struct ncsi_cmd_arg *nca, unsigned int mf_id) 
		return -1;

	}



	/* Set the flag for GMA command which should only be called once */

	nca->ndp->gma_flag = 1;



	/* Get Mac address from NCSI device */

	return nch->handler(nca);

}

net/ncsi/ncsi-rsp.c

+6 −0
Original line number Diff line number Diff line
@@ -627,6 +627,9 @@ static int ncsi_rsp_handler_oem_mlx_gma(struct ncsi_request *nr) 
	saddr.sa_family = ndev->type;

	ndev->priv_flags |= IFF_LIVE_ADDR_CHANGE;

	memcpy(saddr.sa_data, &rsp->data[MLX_MAC_ADDR_OFFSET], ETH_ALEN);

	/* Set the flag for GMA command which should only be called once */

	ndp->gma_flag = 1;



	ret = ops->ndo_set_mac_address(ndev, &saddr);

	if (ret < 0)

		netdev_warn(ndev, "NCSI: 'Writing mac address to device failed\n");
@@ -671,6 +674,9 @@ static int ncsi_rsp_handler_oem_bcm_gma(struct ncsi_request *nr) 
	if (!is_valid_ether_addr((const u8 *)saddr.sa_data))

		return -ENXIO;



	/* Set the flag for GMA command which should only be called once */

	ndp->gma_flag = 1;



	ret = ops->ndo_set_mac_address(ndev, &saddr);

	if (ret < 0)

		netdev_warn(ndev, "NCSI: 'Writing mac address to device failed\n");