From patchwork Wed Oct 25 14:48:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Vecera X-Patchwork-Id: 158148 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6359:6b8b:b0:164:83eb:24d7 with SMTP id ta11csp2710292rwb; Wed, 25 Oct 2023 07:49:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGS++On0Uann5Dh+viO6z9x1dERUBwR3ZqLN6Vc923TicPmsh5FHSJQ2AhK5KiCVrDoAHAb X-Received: by 2002:aca:2319:0:b0:3b2:e34f:3495 with SMTP id e25-20020aca2319000000b003b2e34f3495mr17339653oie.33.1698245380526; Wed, 25 Oct 2023 07:49:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698245380; cv=none; d=google.com; s=arc-20160816; b=KisS9A9MtcwXJyzxgtgoY2kO1hPLsDvc0E1ixQQZXSm94quSdtFo2D/UtlzCYMkAhT GvpotHDAhzjGsQ7PRfFYMAj5WD1/NLdtP80/9jYu7n4dls1eNaG+r2A4B79jVZzsOc5V G3usCcuWcca/7NQ+IDqBcuyXMGS4E+xMML0qy1SsijndacrblddL4RsDehCvki2ncL6c ZlIxT4pWRGqb5p3QoeXTgvzkcqqFu8OJcKgT9RX7V+lZ5ZPz/3pWCknkv41OZwBA9/gS qq0rpKdyv7cre4gJmSFK2wyGa2sKnAfQJ55uAXiui6/+XjJH1b9DIWYq8eeGB4VmyJiy 9qmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=/Pt8PD3fKJKJEHUeXOD6j5kypGWK1I6rGvh+TneYCRQ=; fh=UKZ2RhZY8irBYY7p5UR/RIKU6JB+nmgOmOjBiycYnMU=; b=0Azbt+0cY5SWAdLK3IdVdyucd+oSp0vyoQ9irRTZ1HYeGH7VHefv2f76qbC1vokwP6 nCG6K6R1BbtQw7flF/koukNp8xmvniBs2wHODULApVQY+KD3R5WqR61GSb0JL2IN3DaJ bXQ8jisrtpLEgfErkJaB9heKMYhU+je5okQjf3mcl5bWYGACNFzQtqs+gqZzov+bUc/v lmrJH7LVJDYcLTR/x9ZF49CCF+SUzT0piSlNtsBAz4QO7GyJbKJ/R9IYScFhbB6jZRWS Pn5/T9qG/XO3hVOYW22tjALzdStHzWHgMZ66OJQVkisiUQVaRZ918UanitNQHA3RUGJn lpmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Hv9q02rO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id v38-20020a25fc26000000b00d9a39b80f8csi11302215ybd.383.2023.10.25.07.49.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 07:49:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Hv9q02rO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 3460D8106864; Wed, 25 Oct 2023 07:49:39 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344016AbjJYOtd (ORCPT + 26 others); Wed, 25 Oct 2023 10:49:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233628AbjJYOtb (ORCPT ); Wed, 25 Oct 2023 10:49:31 -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 6041FDC for ; Wed, 25 Oct 2023 07:48:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698245325; 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=/Pt8PD3fKJKJEHUeXOD6j5kypGWK1I6rGvh+TneYCRQ=; b=Hv9q02rOyJEZbRM0HarzRfnFLLIAxMaymUm9bv4p0YD+/Nl5x01GfBXycaCL/Z8qzOmjlt V/UwrVM8+m3W7sYuh+gbXdbqoHpg4teFd4fwIVxgem7Lp/zLggA8XtCT7ftOdhdZ1mUivd FxAlqMYig2G62N3fiQnfBdJq8+fvUNw= 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-316-8kJ3MnFsNg-wBKvUmRwjXw-1; Wed, 25 Oct 2023 10:48:41 -0400 X-MC-Unique: 8kJ3MnFsNg-wBKvUmRwjXw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 AA182857CF1; Wed, 25 Oct 2023 14:48:40 +0000 (UTC) Received: from p1.luc.cera.cz (unknown [10.45.225.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id D704B2026D66; Wed, 25 Oct 2023 14:48:38 +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 , Wojciech Drewek , Michal Schmidt Subject: [PATCH iwl-next v2] i40e: Delete unused i40e_mac_info fields Date: Wed, 25 Oct 2023 16:48:38 +0200 Message-ID: <20231025144838.1827302-1-ivecera@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 25 Oct 2023 07:49:39 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780739348152524224 X-GMAIL-MSGID: 1780739348152524224 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. Reviewed-by: Wojciech Drewek Co-developed-by: Michal Schmidt Signed-off-by: Michal Schmidt Signed-off-by: Ivan Vecera Tested-by: Pucha Himasekhar Reddy (A Contingent worker at Intel) --- 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/ethernet/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_device *dev, u8 *perm_addr) { struct i40e_pf *pf = i40e_netdev_to_pf(dev); - int i, j; + int i; memset(perm_addr, 0xff, MAX_ADDR_LEN); for (i = 0; i < dev->addr_len; i++) perm_addr[i] = pf->hw.mac.perm_addr[i]; - - for (j = 0; j < dev->addr_len; j++, i++) - perm_addr[i] = pf->hw.mac.san_addr[j]; } static const struct dcbnl_rtnl_ops dcbnl_ops = { diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/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] = %08lx\n", i, vsi->state[i]); if (vsi == pf->vsi[pf->lan_vsi]) - dev_info(&pf->pdev->dev, " MAC address: %pM SAN MAC: %pM Port MAC: %pM\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/ethernet/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; }; enum i40e_aq_resources_ids {