From patchwork Tue Oct 27 13:49:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 311913 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A128C4363A for ; Tue, 27 Oct 2020 17:46:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13D292244C for ; Tue, 27 Oct 2020 17:46:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603820789; bh=nFu3G1aXMLT+TVBWsmBJJOO4RMTQ6HbsJYqt7qryeMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wV8dvttbneb+Z6Xc6RoUOWPT+rrTtH2fyfG1plmgBr44xQsedB6mD5p301eakgvKd KazI552DX7p7GdfU9y4xGdONCHfJjKIO0c3u6hQMwxIG0HLoLr59+Xi8SLoDMfDB8U nT3V9WGeteMJcZCCMqA84M5jPz6zJQJG5NTQ0+0c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2902130AbgJ0Oak (ORCPT ); Tue, 27 Oct 2020 10:30:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:56150 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759353AbgJ0O33 (ORCPT ); Tue, 27 Oct 2020 10:29:29 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D4DB320754; Tue, 27 Oct 2020 14:29:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603808969; bh=nFu3G1aXMLT+TVBWsmBJJOO4RMTQ6HbsJYqt7qryeMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M8KxFmghfj3dHt3qei602t++FywgIpM6Lxv0qftMR+8oP5jrNrVbKRgoipzvMvgTQ 1TK4hDA3/7IWM4vnZNtAmgjwi8UV/YQTYTlhUdnzI2eakSsAKbpx5P2+59y805n9IU EWkL7XgyKnMVFergtPpwgKSdaWnlqGTQ6hCMsxEg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lijun Pan , Jakub Kicinski Subject: [PATCH 5.4 028/408] ibmvnic: save changed mac address to adapter->mac_addr Date: Tue, 27 Oct 2020 14:49:26 +0100 Message-Id: <20201027135456.367152981@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lijun Pan [ Upstream commit d9b0e599b2b892422f1cbc5d2658049b895b2b58 ] 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 Link: https://lore.kernel.org/r/20201020223919.46106-1-ljp@linux.ibm.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/ibm/ibmvnic.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -4074,8 +4074,13 @@ static int handle_change_mac_rsp(union i 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;