Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3091329ybt; Mon, 29 Jun 2020 15:07:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxJGiokR1uywaClCaVMkffnpb1pACiZDTM1XbLOWk4R79qmFSipdBQ5XFRzm/foIGXXXLy X-Received: by 2002:a05:6402:1346:: with SMTP id y6mr20025393edw.192.1593468471828; Mon, 29 Jun 2020 15:07:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593468471; cv=none; d=google.com; s=arc-20160816; b=Op3HO32C2zWugunCbHJCvCNVb+5HtVVPZQx2hlhVNF0qlx5y4+yqiXEQ9FgN5sAY5B FYOr4kaOsJAQIVoHw95J7ZFqy/+XlZpO0hP9nti0SHvR3Sucut8kyNtOtky6akUWrdf9 hL3tx2v0lqYrPgp9Mz5I2o+ud1j7qQWtWNY2NbbGh6qA55vWxGFexDBnI6Hgh3zagHkQ kBAcMpopXlhyyT/O/jKmMxOQ0UeEfQShGA45suWJUD0kKrrWCQzlrUDVa0TwgFiDto/+ WNYc4wr6fyokiV2d+yTGmPPHOUr8ohAFYfQALnMFFiGiOWCRzFCRL+dFPW8OzWwOdMeV XaRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QMndCXJsUOjvB00w8VGcFIo7C8Y2eSRE2zQGum70eKs=; b=GRX6gnDJRk2kZFdG6UlpOPtmBMSUr4UJyvcl2I5V2bzqgWGOZ6mnoox/+7BAm7/Fol S3wRn0eLFG2R7Dazi8EUwGTOljIBvwnZvHe2bZzgawOwaEtQTAnt6JDndszZcyAz2spz +zhDYCnBmA4420xRpG86u/hP/4wdC9E1g61iSSsNo+G5vPbg83qyy2IZtmTHAff2im2k 4zOjMsbAzEkhv+3h6c2MtVce0kCg/t3Kw3O0A+Q+pkQJ3pO6yde4EuwJglhSrCBJ8K0X f5U8UDO3+DOZwc1lSrCeUJQ1GYA9OH6HBlw+lwtpQeRAwNMQE/WQhnjlsTPr9wojid5s zQFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=upSYItex; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p3si492060edx.495.2020.06.29.15.07.28; Mon, 29 Jun 2020 15:07:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=default header.b=upSYItex; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390452AbgF2WGD (ORCPT + 99 others); Mon, 29 Jun 2020 18:06:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:56796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726150AbgF2SfT (ORCPT ); Mon, 29 Jun 2020 14:35:19 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 17A1D24170; Mon, 29 Jun 2020 15:19:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593443947; bh=34dyPVdeFg/qO3TlEhfhP7V9iu5OMl+FVa3uPJqFPrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=upSYItexZM6D2ivENzSY+dn1AUqvg4fgriaByFQFXAeAxoICzpa3MT9UJCCl8/in9 Aol4MCrCtLHnVJ4J8M+dONlN2BR91FSSSzchZIvqQtrPbeUIjdozu42ExmGjzcjw0l 9m7Dd2GCl8VYh9xD2pE34xX5QnMAiFoEyiHHBmNE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shannon Nelson , Jakub Kicinski , "David S . Miller" , Greg Kroah-Hartman Subject: [PATCH 5.7 049/265] ionic: update the queue count on open Date: Mon, 29 Jun 2020 11:14:42 -0400 Message-Id: <20200629151818.2493727-50-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shannon Nelson [ Upstream commit fa48494cce5f6360b0f8683cdf258fb45c666287 ] Let the network stack know the real number of queues that we are using. v2: added error checking Fixes: 49d3b493673a ("ionic: disable the queues on link down") Signed-off-by: Shannon Nelson Reviewed-by: Jakub Kicinski Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index 7aa037c3fe020..2729b0bb12739 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -1653,6 +1653,14 @@ int ionic_open(struct net_device *netdev) if (err) goto err_out; + err = netif_set_real_num_tx_queues(netdev, lif->nxqs); + if (err) + goto err_txrx_deinit; + + err = netif_set_real_num_rx_queues(netdev, lif->nxqs); + if (err) + goto err_txrx_deinit; + /* don't start the queues until we have link */ if (netif_carrier_ok(netdev)) { err = ionic_start_queues(lif); -- 2.25.1