diff mbox series

[net,v2] ibmvnic: save changed mac address to adapter->mac_addr

Message ID 20201020223919.46106-1-ljp@linux.ibm.com (mailing list archive)
State Not Applicable
Delegated to: Netdev Maintainers
Headers show
Series [net,v2] ibmvnic: save changed mac address to adapter->mac_addr | expand

Commit Message

Lijun Pan Oct. 20, 2020, 10:39 p.m. UTC
After mac address change request completes successfully, the new mac
address need to be saved to adapter->mac_addr as well as
netdev->dev_addr. Otherwise, adapter->mac_addr still holds old
data.

Fixes: 62740e97881c ("net/ibmvnic: Update MAC address settings after adapter reset")
Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
---
v2: add a note to differentiate crq->change_mac_addr
    and crq->change_mac_addr.rsp.
    add a space in "Fixes" line

 drivers/net/ethernet/ibm/ibmvnic.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Jakub Kicinski Oct. 22, 2020, 4:06 a.m. UTC | #1
On Tue, 20 Oct 2020 17:39:19 -0500 Lijun Pan wrote:
> After mac address change request completes successfully, the new mac
> address need to be saved to adapter->mac_addr as well as
> netdev->dev_addr. Otherwise, adapter->mac_addr still holds old
> data.
> 
> Fixes: 62740e97881c ("net/ibmvnic: Update MAC address settings after adapter reset")
> Signed-off-by: Lijun Pan <ljp@linux.ibm.com>

Applied.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 1b702a43a5d0..4dd3625a4fbc 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -4194,8 +4194,13 @@  static int handle_change_mac_rsp(union ibmvnic_crq *crq,
 		dev_err(dev, "Error %ld in CHANGE_MAC_ADDR_RSP\n", rc);
 		goto out;
 	}
+	/* crq->change_mac_addr.mac_addr is the requested one
+	 * crq->change_mac_addr_rsp.mac_addr is the returned valid one.
+	 */
 	ether_addr_copy(netdev->dev_addr,
 			&crq->change_mac_addr_rsp.mac_addr[0]);
+	ether_addr_copy(adapter->mac_addr,
+			&crq->change_mac_addr_rsp.mac_addr[0]);
 out:
 	complete(&adapter->fw_done);
 	return rc;