Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp23932imu; Wed, 21 Nov 2018 14:41:42 -0800 (PST) X-Google-Smtp-Source: AFSGD/U/c0NpYIH1z7ALP4ADK5+zSYItY+NhG+wwwYjGH1MfHjnQlIvXiOBpGtas7CZa52YYDUi3 X-Received: by 2002:a63:a35c:: with SMTP id v28mr7639462pgn.205.1542840102495; Wed, 21 Nov 2018 14:41:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542840102; cv=none; d=google.com; s=arc-20160816; b=ylKoEv0NkvcF7fEQyTXDQyJZPHweS/p/FH7WQNmCCkLIR0/ZuoIcbwjNaKwJWfixHI zofhAOJf25mMS/HBJYqaa+X5mCAmP+xIrRsfJ1k8KKrZJJgKIxR1Ul5vnNswnRggnl+K MPpQZGkPMXO5YZ0iVAZx04GJ4V2rborLlZBnXf9WvVhqTooPelm+4/BwecVkLRrMGFit +RkzZLYZ8A51oXwKoJ3j/mA5pPS3PhI6qE+j4aFJA0B0QQY3ZWdGk2If6zG1IkPHbzko 1z94FWeQ8MXwtavtAD8ylXBCV+v5yvC3lN5zOTUD6qv+nEYETRlVjYNNNmTI4hxMaAyh kvuA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=M+NUCGpq+7jwcUh7crJ53TeOkLiarfFBQ0AxxE/BUiQ=; b=DUqftQeDUULWRvp4VXilK+66lR6J2GibioiCFGYcihj29CBMVzaHmVqB3M9vhFv3z1 bTRiLMmACI5AEA5TZjchznAB+pl1c+Exkh4BD5yKnW9e+3Ro/HqNFSMWXwcHNM5DRp9g flPm2A3t1juVmtuDjQFNW+w3XJHrcz7cFgTLQfPHa9JDvi2frdOT13YiZvgTt+e8R6uD EJQ+IPH/Azhlf8H6mdR9WkKl5dO0ZeBp7js5iT33MH9gmfVcEjJPlL/zfXNHBD0P+HfI MXWKUiTE7rDGAwU0ODtaWASKsJD7CP/G6T3WaiQC7Qfzh/13w3SOWjgPN5/aCkuxhQPX MHFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ktl1MXlI; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 89-v6si6464995plb.405.2018.11.21.14.41.23; Wed, 21 Nov 2018 14:41:42 -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; dkim=pass header.i=@kernel.org header.s=default header.b=ktl1MXlI; 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 S2387658AbeKVFmd (ORCPT + 99 others); Thu, 22 Nov 2018 00:42:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:37000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387605AbeKVFmc (ORCPT ); Thu, 22 Nov 2018 00:42:32 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 22AEE2151B; Wed, 21 Nov 2018 19:06:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542827219; bh=RpLPohFC/JG/zuFe8aIw6NsafC9NbH2jutwsRuyUJwo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ktl1MXlIXpFCi7i+PqvSIKOCRJTiT/5hDizHQIg087UtPbmPIYLF95Sy6lcVXb/ak P+0prV+N0EfX9bagoPJ7uJVBup87xYL3nkfeQARH0bGcSL5H9d8jMw8hIyKd6BoXnO GEKPJUc/eM+2h4SX7NN5eX+A4BHHSttOsWOuPi0U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Or Gerlitz , Roi Dayan , Saeed Mahameed Subject: [PATCH 4.19 19/42] net/mlx5e: Claim TC hw offloads support only under a proper build config Date: Wed, 21 Nov 2018 20:05:55 +0100 Message-Id: <20181121183148.862371599@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121183147.869199006@linuxfoundation.org> References: <20181121183147.869199006@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Or Gerlitz [ Upstream commit 077ecd785d90c6cbba08d719faa4be8561aa0a1e ] Currently, we are only supporting tc hw offloads when the eswitch support is compiled in, but we are not gating the adevertizment of the NETIF_F_HW_TC feature on this config being set. Fix it, and while doing that, also avoid dealing with the feature on ethtool when the config is not set. Fixes: e8f887ac6a45 ('net/mlx5e: Introduce tc offload support') Signed-off-by: Or Gerlitz Reviewed-by: Roi Dayan Signed-off-by: Saeed Mahameed Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -3566,6 +3566,7 @@ static int set_feature_cvlan_filter(stru return 0; } +#ifdef CONFIG_MLX5_ESWITCH static int set_feature_tc_num_filters(struct net_device *netdev, bool enable) { struct mlx5e_priv *priv = netdev_priv(netdev); @@ -3578,6 +3579,7 @@ static int set_feature_tc_num_filters(st return 0; } +#endif static int set_feature_rx_all(struct net_device *netdev, bool enable) { @@ -3676,7 +3678,9 @@ static int mlx5e_set_features(struct net err |= MLX5E_HANDLE_FEATURE(NETIF_F_LRO, set_feature_lro); err |= MLX5E_HANDLE_FEATURE(NETIF_F_HW_VLAN_CTAG_FILTER, set_feature_cvlan_filter); +#ifdef CONFIG_MLX5_ESWITCH err |= MLX5E_HANDLE_FEATURE(NETIF_F_HW_TC, set_feature_tc_num_filters); +#endif err |= MLX5E_HANDLE_FEATURE(NETIF_F_RXALL, set_feature_rx_all); err |= MLX5E_HANDLE_FEATURE(NETIF_F_RXFCS, set_feature_rx_fcs); err |= MLX5E_HANDLE_FEATURE(NETIF_F_HW_VLAN_CTAG_RX, set_feature_rx_vlan); @@ -4685,7 +4689,9 @@ static void mlx5e_build_nic_netdev(struc FT_CAP(modify_root) && FT_CAP(identified_miss_table_mode) && FT_CAP(flow_table_modify)) { +#ifdef CONFIG_MLX5_ESWITCH netdev->hw_features |= NETIF_F_HW_TC; +#endif #ifdef CONFIG_MLX5_EN_ARFS netdev->hw_features |= NETIF_F_NTUPLE; #endif