From patchwork Wed Nov 16 14:10:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101521 Delivered-To: patch@linaro.org Received: by 10.182.1.168 with SMTP id 8csp201671obn; Wed, 16 Nov 2016 06:11:36 -0800 (PST) X-Received: by 10.99.95.86 with SMTP id t83mr8753448pgb.0.1479305496057; Wed, 16 Nov 2016 06:11:36 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n28si32069120pgd.148.2016.11.16.06.11.35; Wed, 16 Nov 2016 06:11:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932811AbcKPOLc (ORCPT + 26 others); Wed, 16 Nov 2016 09:11:32 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:56395 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752029AbcKPOL3 (ORCPT ); Wed, 16 Nov 2016 09:11:29 -0500 Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0M3jdZ-1cy9cG08NF-00rIsb; Wed, 16 Nov 2016 15:11:21 +0100 From: Arnd Bergmann To: "David S. Miller" Cc: Arnd Bergmann , Jakub Kicinski , Rolf Neugebauer , oss-drivers@netronome.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] netronome: don't access real_num_rx_queues directly Date: Wed, 16 Nov 2016 15:10:49 +0100 Message-Id: <20161116141118.1893244-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:fQkiqRQMnW11kgQLl13bxeboElBvXZl2C7VEjVfwVml6fSF8kXS jXGCXL/RWLiXoqK4fAx6VUCsqaT3Hw51XQBErFDElKapd/M+/skxmy23i/yckSc9CnwmhTt FDWYGBOdxm56U9lmoGxnfGPMV9Dmy7nFgDJvL142ixDgFBJumCdDJv++yEj/TI15J80/bEt hEZLDfjLQ6X+89iDyTL6Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:aD4/lQYDd8A=:6PDwjbB+VGDLBlfBDd4HQd 6X9aChBBOlL5lN3oBQ0sNTyiMAhoanq2nxtY52ELXqhuV+92gmmNWNpvZiVzRv9bRy4ylkpUH r5dW5qbfCMSFDrW3nVZIxYp3o8TzaxFeVWU37dl/Gb5pSt9KBqgT4NZWOiqQTd/RrY3RZDlPr FaXgWZPR/IJOY4vRPjMivKRU8NhBsMnUIOeS3CaVSWbjso9UUfGUxR6ZItzj24J8warNGIkrY 3tk3BWdMzm71vqORMME0tg6bsBuE0F1p1RZqO4HbIVxNy/SUppcDMAh2Szi87FgEHNRDFUVzU nYgid2Q3dsSIKaQIdZ/+B+t9QXJiYTw4eW0QnAsJ+R+u3YMtU+hqd0tjUjSCSshbCm0vGFcr4 AgGUCuhaDCosW9bCkCI32lb9eN1igdtzkQlz1448c5a6kdSzMJBTFDTwRJw62h5/YFmzwJTYX VQQUEevWGVRP18vuXZGU9YSFNR4kVLvJJSYSGOthNFylbbekkqJ4qpidVNWN0M1j6kXCPm1ZR MhhUxmx80xyEO339mrQfnqYeMKUccusg+0LsMTGfNMlGcrbD3Ty1pS1li7P9lsIrmLqP7PVRz 2K7QLARn6c10kzs8mg2otJUmf/+9XgQL9Lkg7iPDoLKWTid1K+ujKiHRkTMHZA7Mn2YYtIwR+ NU6mDjE/Hjz7aqWVN+31061+s4hVbjrO/MA7YpyiZddvM179/CFUxqn1CBGSxD+GHPfY= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The netdev->real_num_rx_queues setting is only available if CONFIG_SYSFS is enabled, so we now get a build failure when that is turned off: netronome/nfp/nfp_net_common.c: In function 'nfp_net_ring_swap_enable': netronome/nfp/nfp_net_common.c:2489:18: error: 'struct net_device' has no member named 'real_num_rx_queues'; did you mean 'real_num_tx_queues'? As far as I can tell, the check here is only used as an optimization that we can skip in order to fix the compilation. If sysfs is disabled, the following netif_set_real_num_rx_queues() has no effect. Fixes: 164d1e9e5d52 ("nfp: add support for ethtool .set_channels") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 99edb9fd84bf..eb3715700c95 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -2486,15 +2486,13 @@ nfp_net_ring_swap_enable(struct nfp_net *nn, unsigned int *num_vecs, for (r = 0; r < nn->max_r_vecs; r++) nfp_net_vector_assign_rings(nn, &nn->r_vecs[r], r); - if (nn->netdev->real_num_rx_queues != nn->num_rx_rings) { - if (!netif_is_rxfh_configured(nn->netdev)) - nfp_net_rss_init_itbl(nn); + if (!netif_is_rxfh_configured(nn->netdev)) + nfp_net_rss_init_itbl(nn); - err = netif_set_real_num_rx_queues(nn->netdev, - nn->num_rx_rings); - if (err) - return err; - } + err = netif_set_real_num_rx_queues(nn->netdev, + nn->num_rx_rings); + if (err) + return err; if (nn->netdev->real_num_tx_queues != nn->num_stack_tx_rings) { err = netif_set_real_num_tx_queues(nn->netdev,