From patchwork Thu Nov 2 23:34:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander H Duyck X-Patchwork-Id: 833586 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=osuosl.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eg2Rd4+x"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yShJn3WD4z9sPm for ; Fri, 3 Nov 2017 10:35:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 12E8687FD4; Thu, 2 Nov 2017 23:35:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Yu3BmNbreuCQ; Thu, 2 Nov 2017 23:35:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A36CF87F02; Thu, 2 Nov 2017 23:35:02 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 15AF51C2306 for ; Thu, 2 Nov 2017 23:35:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0EE3787F02 for ; Thu, 2 Nov 2017 23:35:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lOtmTayVcmQB for ; Thu, 2 Nov 2017 23:35:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by fraxinus.osuosl.org (Postfix) with ESMTPS id F349587EEB for ; Thu, 2 Nov 2017 23:34:59 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id 17so835262pfn.12 for ; Thu, 02 Nov 2017 16:34:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=iLjHRixSDCRTQfcLDjM+FpUO1hYT+7rfHsXO46gnGlw=; b=eg2Rd4+x3go7GOjRASi4KRt4RrcMGr8ujbqfRvKWGQFWvphooXsrUyip0j9GhJeS9z YTmIofzdboA2wz5VsXi2VGlupAKIyeS2leWyofDw5rS8wB0HY2v2ud1ZyDl1PsJMeeFQ zy/hz8zjPC9uZThu7qXag9kXqVy1vyC1PyCdU5YHndO91OROyInrB7WMl3FjvhFrvY0c GuU+QuLFAhMhHEkvK/6y1DmOGTg0DWRBEFCwO5pqyc7dhh+3R6UhBIMOvETrp9HclASq 1DmuN0kHz8yxit4jrBFqIAtn3gY2dzlZkQqEn/eVUXCpKCRD1DuPxupLQI9jpHxNqa4I gIfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=iLjHRixSDCRTQfcLDjM+FpUO1hYT+7rfHsXO46gnGlw=; b=ULdoreLLv5IuEhJ8jLXurLKNPAbsKcngET7AseH4XvX4+kUIQKDUsVanuwL5gGrN1r mdtZJWpO2F+LcUPhbx4XXWhJPbq5gqNB3Xm9lDGyJ83FkNnvzQUL+evyWwveqF8uldYn YOZi3mcmZ1uqbkev2QM05idSl4Ck+i3E8L4L4ONZfNuk6isL5TrkNV7P+Trci4xKsvHF gePYehZ1AkuOzx3gGoLj7ulufED17fOB8iveOPO1HjvRmcYCXz7172fzgXednB8Bjz5c JGkGqtcbwQbp6fs/Q4vrXGqkCHdAPkwRh9dx92aVviMMvTHoUsrONO409rlcfIPhBTKg mVAg== X-Gm-Message-State: AMCzsaXCWSHt5d7MTMhCfCePUvXLAAdHUNsQmMOoxSlezSbM+Rl7UgTT /wLwWCJ5JCkQq7aLtsk8DJI= X-Google-Smtp-Source: ABhQp+S/XlxoUQabx7R8XrWnOP1P/1yyMr6qLWCr+onUpuWHGCdEeT//d8k+I/bYbIxUpvOcDxQ3zw== X-Received: by 10.84.168.69 with SMTP id e63mr4947657plb.340.1509665699428; Thu, 02 Nov 2017 16:34:59 -0700 (PDT) Received: from localhost.localdomain ([2001:470:b:9c3:9e5c:8eff:fe4f:f2d0]) by smtp.gmail.com with ESMTPSA id g24sm8847276pfk.0.2017.11.02.16.34.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Nov 2017 16:34:58 -0700 (PDT) From: Alexander Duyck To: netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org Date: Thu, 02 Nov 2017 16:34:58 -0700 Message-ID: <20171102233447.15146.63844.stgit@localhost.localdomain> In-Reply-To: <20171102232857.15146.21583.stgit@localhost.localdomain> References: <20171102232857.15146.21583.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Subject: [Intel-wired-lan] [jkirsher/next-queue PATCH 5/5] dev: Cap number of queues even with accel_priv X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Alexander Duyck With the recent fix to ixgbe we can cap the number of queues always regardless of if accel_priv is being used or not since the actual number of queues are being reported via real_num_tx_queues. Signed-off-by: Alexander Duyck Reviewed-by: Jesse Brandeburg --- net/core/dev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index fd51b8703277..59dcc1b26ae2 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3393,8 +3393,7 @@ struct netdev_queue *netdev_pick_tx(struct net_device *dev, else queue_index = __netdev_pick_tx(dev, skb); - if (!accel_priv) - queue_index = netdev_cap_txqueue(dev, queue_index); + queue_index = netdev_cap_txqueue(dev, queue_index); } skb_set_queue_mapping(skb, queue_index);