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.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 BE14FECE58D for ; Sun, 6 Oct 2019 12:34:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9510E2080F for ; Sun, 6 Oct 2019 12:34:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="kRRc513e" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726474AbfJFMd7 (ORCPT ); Sun, 6 Oct 2019 08:33:59 -0400 Received: from smtp-fw-2101.amazon.com ([72.21.196.25]:11033 "EHLO smtp-fw-2101.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726291AbfJFMd6 (ORCPT ); Sun, 6 Oct 2019 08:33:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1570365238; x=1601901238; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=soOUvI3yPLZeugbkepvG5dq+mlfWAulAfIPrUk+oozA=; b=kRRc513ejlzRNdTolLLjxKjFm2OJtUOXDcqN3M3RfCe4L8mvMA6WTEiP 0nChhCLku2HYTw+YQ0K5aATr+gSYdzRws2j24YYcjkvj27YAnRjshjOOS D9OjF1Jqgf9A6TTRJifkAwKu7KzCwG/qwQinSitQd5vckBMMQOrdmeCJ5 0=; X-IronPort-AV: E=Sophos;i="5.67,263,1566864000"; d="scan'208";a="755848648" Received: from iad6-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-2b-c300ac87.us-west-2.amazon.com) ([10.124.125.2]) by smtp-border-fw-out-2101.iad2.amazon.com with ESMTP; 06 Oct 2019 12:33:57 +0000 Received: from EX13MTAUEB001.ant.amazon.com (pdx4-ws-svc-p6-lb7-vlan2.pdx.amazon.com [10.170.41.162]) by email-inbound-relay-2b-c300ac87.us-west-2.amazon.com (Postfix) with ESMTPS id 521F2A26FD; Sun, 6 Oct 2019 12:33:57 +0000 (UTC) Received: from EX13D08UEB003.ant.amazon.com (10.43.60.11) by EX13MTAUEB001.ant.amazon.com (10.43.60.96) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Sun, 6 Oct 2019 12:33:42 +0000 Received: from EX13MTAUEB001.ant.amazon.com (10.43.60.96) by EX13D08UEB003.ant.amazon.com (10.43.60.11) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Sun, 6 Oct 2019 12:33:42 +0000 Received: from HFA16-8226Y22.hfa16.amazon.com (10.218.52.96) by mail-relay.amazon.com (10.43.60.129) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Sun, 6 Oct 2019 12:33:39 +0000 From: To: , CC: Sameeh Jubran , , , , , , , , , , , , Subject: [PATCH V3 net-next 3/6] net: ena: ethtool: get_channels: use combined only Date: Sun, 6 Oct 2019 15:33:25 +0300 Message-ID: <20191006123328.24210-4-sameehj@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191006123328.24210-1-sameehj@amazon.com> References: <20191006123328.24210-1-sameehj@amazon.com> MIME-Version: 1.0 Content-Type: text/plain Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Sameeh Jubran Since we use the same IRQ and NAPI to service RX and TX then we need to use a combined channel instead of rx and tx channels. Signed-off-by: Sameeh Jubran --- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c index 3ad661fd9..03b4ae7ba 100644 --- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c +++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c @@ -734,14 +734,8 @@ static void ena_get_channels(struct net_device *netdev, { struct ena_adapter *adapter = netdev_priv(netdev); - channels->max_rx = adapter->num_io_queues; - channels->max_tx = adapter->num_io_queues; - channels->max_other = 0; - channels->max_combined = 0; - channels->rx_count = adapter->num_io_queues; - channels->tx_count = adapter->num_io_queues; - channels->other_count = 0; - channels->combined_count = 0; + channels->max_combined = adapter->num_io_queues; + channels->combined_count = adapter->num_io_queues; } static int ena_get_tunable(struct net_device *netdev, -- 2.17.1