From patchwork Thu Mar 3 14:55:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Vadai X-Patchwork-Id: 591476 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C2FB214178F for ; Fri, 4 Mar 2016 01:52:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932234AbcCCOwQ (ORCPT ); Thu, 3 Mar 2016 09:52:16 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33184 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932070AbcCCOwO (ORCPT ); Thu, 3 Mar 2016 09:52:14 -0500 Received: by mail-wm0-f65.google.com with SMTP id n186so4502801wmn.0 for ; Thu, 03 Mar 2016 06:52:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DJtDdHB2qd0d9uYdxw8TcnRHfHWlVSh0kt9rJPe3pXg=; b=JhMN1zA3w4q9n4aJS9BZQxTE6Lou3ahOH8KC7qCOVBVF3JnYIy8gnfneBw1kPddut3 h3JIpWdirZdwhkxe9EzWOkBlHLXPHIf5DxGOmwELgHr5IredLSKx3TVKgNnjavr3xuYQ ZvcYjH9ic+5+GXsXylF7fb7xDLargkxnIDZrgR3+evSrrWCD+AuQfNSILL7B0Xs/MQFJ kIsyWpf/dJQiH+gozPSPqpP6Jo8+kvqtYy3wY39zPRotr8rVHzmFPAQxwy5uvNSt0a3s tbXWvFy3QnYEibJvzkX2Z9QwFa6P+6ZSqjNfzG/xYx7sqRS3x4qTpd95AT/kCs2lJ9Sj g6BQ== X-Gm-Message-State: AD7BkJLWCmwbcFbyFrl2vyRn3p/EO+CfPMF6P49D2swyWG0CCnfgK4bCmiJTJ86GKZIMwg== X-Received: by 10.28.144.195 with SMTP id s186mr6575797wmd.9.1457016732992; Thu, 03 Mar 2016 06:52:12 -0800 (PST) Received: from localhost.localdomain (212.116.172.4.static.012.net.il. [212.116.172.4]) by smtp.gmail.com with ESMTPSA id y3sm9304575wmy.17.2016.03.03.06.52.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Mar 2016 06:52:11 -0800 (PST) From: Amir Vadai To: "David S. Miller" Cc: netdev@vger.kernel.org, John Fastabend , Jiri Pirko , Or Gerlitz , Saeed Mahameed , Hadar Har-Zion , Rony Efraim , Amir Vadai Subject: [PATCH net-next V2 06/10] net/mlx5e: Relax ndo_setup_tc handle restriction Date: Thu, 3 Mar 2016 16:55:56 +0200 Message-Id: <1457016960-27832-7-git-send-email-amir@vadai.me> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457016960-27832-1-git-send-email-amir@vadai.me> References: <1457016960-27832-1-git-send-email-amir@vadai.me> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Restricting handle to TC_H_ROOT breaks the old instantiation of mqprio to setup a hardware qdisc. This patch relaxes the test, to only check the type. Fixes: 08fb1da ("net/mlx5e: Support DCBNL IEEE ETS") Signed-off-by: Amir Vadai --- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 5063c0e..5e3692f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -1883,7 +1883,7 @@ static int mlx5e_setup_tc(struct net_device *netdev, u8 tc) static int mlx5e_ndo_setup_tc(struct net_device *dev, u32 handle, __be16 proto, struct tc_to_netdev *tc) { - if (handle != TC_H_ROOT || tc->type != TC_SETUP_MQPRIO) + if (tc->type != TC_SETUP_MQPRIO) return -EINVAL; return mlx5e_setup_tc(dev, tc->tc);