From patchwork Tue Mar 8 10:42:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Vadai X-Patchwork-Id: 594006 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 1CF87140B9E for ; Tue, 8 Mar 2016 21:40:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932964AbcCHKj5 (ORCPT ); Tue, 8 Mar 2016 05:39:57 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35148 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933177AbcCHKjX (ORCPT ); Tue, 8 Mar 2016 05:39:23 -0500 Received: by mail-wm0-f67.google.com with SMTP id 1so3232394wmg.2 for ; Tue, 08 Mar 2016 02:39:23 -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=K0YrVI8pCCBOP9YD9b6eYyD8CbhTXdUlIvxmS7YLstZfOLlW/HL9pxTELoPfvM+4uH aOZuCNmW8Lcy1Uyp1NKKBwz9a1vQLIxP/R6Q0I++KbWgimRG9dD2o5b6GX0lDdFOROCM 6nDo0tC/aYgXQyCEbHGDbvWllNyc6oeDjtyfXaNp7gNLBR7VKdx9mn69vT/TpKWhxwyc LwSDm0z7L0PuHEx6Ds/pY9JZYAb4Q9Jvkl+7XlP60Qk7MFl2i9i00F+PMeXwPzm0KW15 z9tCQIEpPj2BHg6PMHm/Yu5QkPA5vebmyDTUaiZY+VfSXlShPJfy1tluof33RXy2MuYh ZsVg== X-Gm-Message-State: AD7BkJItsQ4hF624NCQF+n9zRlkNGr3pmfmx6PKxzfpUi/C5oXWH4BOuvFE+BSPMADc+5w== X-Received: by 10.28.105.136 with SMTP id z8mr18598305wmh.71.1457433562516; Tue, 08 Mar 2016 02:39:22 -0800 (PST) Received: from office.mtl.com? (212.116.172.4.static.012.net.il. [212.116.172.4]) by smtp.gmail.com with ESMTPSA id n66sm2706344wmg.20.2016.03.08.02.39.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Mar 2016 02:39:21 -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 V3 06/10] net/mlx5e: Relax ndo_setup_tc handle restriction Date: Tue, 8 Mar 2016 12:42:34 +0200 Message-Id: <1457433758-9193-7-git-send-email-amir@vadai.me> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457433758-9193-1-git-send-email-amir@vadai.me> References: <1457433758-9193-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);