From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8F5972E8DEB; Sat, 17 Oct 2026 15:56:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792252569; cv=none; b=YA+eIi4o5bqagUXk16nVvntstR+szNfpv9ygrhlzD4vhHPYWwwJwmHnWZ+rHW63IdkVK7sCvZeZVrTwwE5ezl5eG12hSS6Fq9k4X8PRYOnL/oIVv3tGKEPCGTiU7JOroOWRUMy24aZW/t5clZpzLt/bGqakx5S/HilnJgygAIOE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792252569; c=relaxed/simple; bh=fA+oVXQEmuq3+RWGz0vgIk7V2ub6Ki5KIF9587133ic=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P9n/4KDDIpPBXGhXhbZxxoxBiSTgX8uh83tmdYf+WkKjfeHoAHySRwZwdHUOY1Q7NIHMYc7mjVLEffCyTSgvRtPK2REiw6cNkmVTD5q1OpqKWQJTj9s2SCxcEKca3Jllz2rHflgOFGYtNwSlDAm+dKU63Qf9WJF2fH5rAqXHE08= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EPYZPuC3; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="EPYZPuC3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB8831F000C4; Sat, 17 Oct 2026 15:56:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1792252568; bh=RnicKJaBqW7DrGSf6cyPODrUKTq7rzxzhcIat52m+JM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EPYZPuC3WkFUeVlXdIcwmXA8LyciR6H5ajqPQ4Bmhc7+3ypemY/MYd7WJuQP+jNzm +p0YvpUqLtcvh1564Qg3rbYMdNkgknS+1RP6uwqZscCf0j1scQTBITngnkqT365cyz M7wQdz04nWaIhI6L9Jw5oH+ocmOqxen8oH+WZgAk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Corinna Vinschen , Aleksandr Loktionov , Rafal Romanowski , Tony Nguyen , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 08/52] iavf: iavf_virtchnl_completion: drop duplicate ether_addr_equal() test Date: Sat, 17 Oct 2026 17:54:09 +0200 Message-ID: <20261017155105.119807795@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261017155104.830766652@linuxfoundation.org> References: <20261017155104.830766652@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Corinna Vinschen [ Upstream commit 8538aaea10e141457bcb13d51b0d278c697c422a ] This is just a simple cleanup fix. Commit 35a2443d0910f ("iavf: Add waiting for response from PF in set mac") introduced a duplicate ether_addr_equal() check, so the current code tests the new MAC twice against the former MAC. Remove the outer ether_addr_equal() test, remnant of commit c5c922b3e09b ("iavf: fix MAC address setting for VFs when filter is rejected") Signed-off-by: Corinna Vinschen Reviewed-by: Aleksandr Loktionov Tested-by: Rafal Romanowski Signed-off-by: Tony Nguyen Link: https://patch.msgid.link/20260609213559.178657-4-anthony.l.nguyen@intel.com Signed-off-by: Jakub Kicinski Stable-dep-of: 436729a56dd4 ("iavf: send MAC change request synchronously") Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c index f1a01b8e2235c..ad906baa759d5 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c @@ -2546,13 +2546,11 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter, case VIRTCHNL_OP_ADD_ETH_ADDR: if (!v_retval) iavf_mac_add_ok(adapter); - if (!ether_addr_equal(netdev->dev_addr, adapter->hw.mac.addr)) - if (!ether_addr_equal(netdev->dev_addr, - adapter->hw.mac.addr)) { - netif_addr_lock_bh(netdev); - eth_hw_addr_set(netdev, adapter->hw.mac.addr); - netif_addr_unlock_bh(netdev); - } + if (!ether_addr_equal(netdev->dev_addr, adapter->hw.mac.addr)) { + netif_addr_lock_bh(netdev); + eth_hw_addr_set(netdev, adapter->hw.mac.addr); + netif_addr_unlock_bh(netdev); + } wake_up(&adapter->vc_waitqueue); break; case VIRTCHNL_OP_GET_STATS: { -- 2.53.0