From nobody Wed Dec 17 12:56:59 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA979C25B47 for ; Wed, 25 Oct 2023 11:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234064AbjJYLAF (ORCPT ); Wed, 25 Oct 2023 07:00:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229456AbjJYLAD (ORCPT ); Wed, 25 Oct 2023 07:00:03 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B30F1C1 for ; Wed, 25 Oct 2023 03:59:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698231557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hbl9d2tDVXT45ZlkhFJ2cNIXoUOP4mWOh9E5YishFi8=; b=L4CsUodUg8/5OHDWmKzfKNzUo/IT/DvkEktBVWhI5EM2mVukCyJgi58gDjMd8E3eH7I5Az L1KYNtfxptu6FlnLLoceIfn96DlAvf9XudRcqEzkcfao1mAISixKAcSLTtO6Uz05Bb0gUn byIbgUPIfPZXC7ol9uUAQCXRVlrqPAY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-692-T7Rw2M5QPlWoXC_SolU-0g-1; Wed, 25 Oct 2023 06:59:14 -0400 X-MC-Unique: T7Rw2M5QPlWoXC_SolU-0g-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5733F101A54C; Wed, 25 Oct 2023 10:59:14 +0000 (UTC) Received: from p1.luc.cera.cz (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5086F492BD9; Wed, 25 Oct 2023 10:59:12 +0000 (UTC) From: Ivan Vecera To: netdev@vger.kernel.org Cc: Jesse Brandeburg , Tony Nguyen , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org, Jacob Keller , Michal Schmidt Subject: [PATCH iwl-next] i40e: Delete unused i40e_mac_info fields Date: Wed, 25 Oct 2023 12:59:11 +0200 Message-ID: <20231025105911.1204326-1-ivecera@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From commit 9eed69a9147c ("i40e: Drop FCoE code from core driver files") the field i40e_mac_info.san_addr is unused (never filled). The field i40e_mac_info.max_fcoeq is unused from the beginning. Remove both. Co-developed-by: Michal Schmidt Signed-off-by: Ivan Vecera Reviewed-by: Wojciech Drewek --- drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 5 +---- drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 3 +-- drivers/net/ethernet/intel/i40e/i40e_type.h | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c b/drivers/net/et= hernet/intel/i40e/i40e_dcb_nl.c index 1ee77a2433c0..4721845fda6e 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c +++ b/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c @@ -827,15 +827,12 @@ static void i40e_dcbnl_get_perm_hw_addr(struct net_de= vice *dev, u8 *perm_addr) { struct i40e_pf *pf =3D i40e_netdev_to_pf(dev); - int i, j; + int i; =20 memset(perm_addr, 0xff, MAX_ADDR_LEN); =20 for (i =3D 0; i < dev->addr_len; i++) perm_addr[i] =3D pf->hw.mac.perm_addr[i]; - - for (j =3D 0; j < dev->addr_len; j++, i++) - perm_addr[i] =3D pf->hw.mac.san_addr[j]; } =20 static const struct dcbnl_rtnl_ops dcbnl_ops =3D { diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/e= thernet/intel/i40e/i40e_debugfs.c index e0849f0c9c27..88240571721a 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c +++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c @@ -147,9 +147,8 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, = int seid) " state[%d] =3D %08lx\n", i, vsi->state[i]); if (vsi =3D=3D pf->vsi[pf->lan_vsi]) - dev_info(&pf->pdev->dev, " MAC address: %pM SAN MAC: %pM Port MAC: %p= M\n", + dev_info(&pf->pdev->dev, " MAC address: %pM Port MAC: %pM\n", pf->hw.mac.addr, - pf->hw.mac.san_addr, pf->hw.mac.port_addr); hash_for_each(vsi->mac_filter_hash, bkt, f, hlist) { dev_info(&pf->pdev->dev, diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethe= rnet/intel/i40e/i40e_type.h index e3d40630f689..76bcbaec8ae5 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_type.h +++ b/drivers/net/ethernet/intel/i40e/i40e_type.h @@ -270,9 +270,7 @@ struct i40e_mac_info { enum i40e_mac_type type; u8 addr[ETH_ALEN]; u8 perm_addr[ETH_ALEN]; - u8 san_addr[ETH_ALEN]; u8 port_addr[ETH_ALEN]; - u16 max_fcoeq; }; =20 enum i40e_aq_resources_ids { --=20 2.41.0