From patchwork Wed May 12 14:48:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 435608 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp5036114jao; Wed, 12 May 2021 10:31:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3aANGR/szg1LPtCOknGa5hfDj2GnOPjdPrGwADk09mkEatB1D6ey9Hh2MV8ERXTSnwc04 X-Received: by 2002:a92:c052:: with SMTP id o18mr5098520ilf.297.1620840708003; Wed, 12 May 2021 10:31:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620840707; cv=none; d=google.com; s=arc-20160816; b=b0cbljCoMEy83Enl0lK9e2jGWQ+sVxTNzGJ9UipM8iguLeGqOltOuBbLTLqVxVCqRY IyTLq0zmqM6+Ss2pP5gJKJNcwsH5ziipIfyNjBzmKkL0z6FAGwzVCxFhyMoPbJkCe1aI 4tlN3q70bfbR2xSL4qEE2t+esyuxgIGXjU5J3yWRArOoZPKqjs7jiP9niauv2LpCrIYE UZPCC9tA3v7m/Fdd0GL07airZnC+EFe+eGqdc6L0dcZuKIoweIflnviJYRIztj1Utip/ SEKwgdMQXjRfcxJt1/RNjZWM5+v//uL8w2Eo7CQDhGEKdMoGRvS+PepbdwHpwP2d4tBT UOfA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8PLnJc+uaVg3yRM2XArUPvvFrGY5kdODvPrtIpT8FDA=; b=oADQYSoWe7YRtGDP9oFjwWw3z0cDq2ayquDj7KBqHUaBr37O+QIg2IIOVHFeqdEuIw cF8mvXSVlc8BqMuVuZVhBKETtcMUp5U7Mg4/hoQmq+dFlCwraeCInkegTDbGbjxN5STV H09mz3vDK+gbynJ+XhMxacvCdnrlJEt95BxYQLXsNiWsF05yw2WgzW4nwq9edQ+akXJP fgN9L8badLaIKeJfW6EK/qfPIdNBiNzGRZI27rqHqwtnLmPhK9zGMW0pyPdHCqwAo/BN kMO0b4++hzmoCd0M3QlTxFtGV4VdEPlAqXTZxbfV7ybn1oEhUC+IPKFLqF+WmbObRkY/ szgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="GN3yzS/5"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q8si330223ior.12.2021.05.12.10.31.47; Wed, 12 May 2021 10:31:47 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="GN3yzS/5"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235933AbhELQUy (ORCPT + 12 others); Wed, 12 May 2021 12:20:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:49170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239788AbhELQQB (ORCPT ); Wed, 12 May 2021 12:16:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6A28E61D60; Wed, 12 May 2021 15:42:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834165; bh=lSLJoT4QIk1xUJrNIZJtih3pn/Y6owWdbCNbvLmhp6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GN3yzS/5Vy4t8CEiZJ4j29MDfUgJwr7Ne/pzVjlFhaCxKcYpOasiDQ7vt0uA/vJt4 AS5G83S3c3CxH7EOmBon/g8N06P24XvzY+CYLvxgodwey+mumOIcRLHpB4fJ/vh02B 2ktbVFquhi0cP99eWn0gMoQrI9VeOVi33FcfDhVk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Salil Mehta , "David S. Miller" , Sasha Levin Subject: [PATCH 5.11 433/601] net: hns3: Limiting the scope of vector_ring_chain variable Date: Wed, 12 May 2021 16:48:30 +0200 Message-Id: <20210512144842.096906128@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Salil Mehta [ Upstream commit d392ecd1bc29ae15b0e284d5f732c2d36f244271 ] Limiting the scope of the variable vector_ring_chain to the block where it is used. Fixes: 424eb834a9be ("net: hns3: Unified HNS3 {VF|PF} Ethernet Driver for hip08 SoC") Signed-off-by: Salil Mehta Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index 405e49033417..c8a43a725ebc 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -3709,7 +3709,6 @@ static void hns3_nic_set_cpumask(struct hns3_nic_priv *priv) static int hns3_nic_init_vector_data(struct hns3_nic_priv *priv) { - struct hnae3_ring_chain_node vector_ring_chain; struct hnae3_handle *h = priv->ae_handle; struct hns3_enet_tqp_vector *tqp_vector; int ret; @@ -3741,6 +3740,8 @@ static int hns3_nic_init_vector_data(struct hns3_nic_priv *priv) } for (i = 0; i < priv->vector_num; i++) { + struct hnae3_ring_chain_node vector_ring_chain; + tqp_vector = &priv->tqp_vector[i]; tqp_vector->rx_group.total_bytes = 0;