From mboxrd@z Thu Jan 1 00:00:00 1970 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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,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 06D88C433E2 for ; Fri, 19 Jun 2020 15:59:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA2E120809 for ; Fri, 19 Jun 2020 15:58:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592582339; bh=mAFAOClf4WWgFlX0BM9kMf0E/FlsTg46DHwbqPKOSIM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=L+DTdxrkAvJQQZaW5B1THbl/hLpfVHzOZulMc4p1BUAGo9hsj1pKlf8glks7cO/Vn p89el0Bt6qUooUot4CQ8/4sw6orqq6IAMPGfULHJKP7KcgijQauvFM9O5699KXronT InKTiKbjINQQYm7w2lQTzLlC6oCMJggOmfiIvsNM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392554AbgFSP6s (ORCPT ); Fri, 19 Jun 2020 11:58:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:50270 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392611AbgFSPTY (ORCPT ); Fri, 19 Jun 2020 11:19:24 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 D525621919; Fri, 19 Jun 2020 15:19:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579963; bh=mAFAOClf4WWgFlX0BM9kMf0E/FlsTg46DHwbqPKOSIM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2PL57jQm2IysaDEqvxmF7lUrI4o8rVAYKdlgabVl1VV8nEQgK2mhUDonk+3VEkWZz QxxHTB+r9NSIVM0wvd+YLZxOCUYu5X3Ppg4CYNATxVC2EL+yNf5Qm/jgpWMgDgdB4S B2PqG8i8QrUBhHr3iSHIzlsC8Tm08duYokCc845Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marta Plantykow , Andrew Bowers , Jeff Kirsher , Sasha Levin Subject: [PATCH 5.7 070/376] ice: Change number of XDP TxQ to 0 when destroying rings Date: Fri, 19 Jun 2020 16:29:48 +0200 Message-Id: <20200619141713.667748045@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141710.350494719@linuxfoundation.org> References: <20200619141710.350494719@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marta Plantykow [ Upstream commit c8f135c6ee7851ad72bd4d877216950fcbd45fb6 ] When XDP Tx rings are destroyed the number of XDP Tx queues is not changing. This patch is changing this number to 0. Signed-off-by: Marta Plantykow Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 5b190c257124..599dab844034 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -1898,6 +1898,9 @@ free_qmap: for (i = 0; i < vsi->tc_cfg.numtc; i++) max_txqs[i] = vsi->num_txq; + /* change number of XDP Tx queues to 0 */ + vsi->num_xdp_txq = 0; + return ice_cfg_vsi_lan(vsi->port_info, vsi->idx, vsi->tc_cfg.ena_tc, max_txqs); } -- 2.25.1