From patchwork Fri Jul 15 09:15:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 648725 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 3rrRk52zyFz9s5l for ; Fri, 15 Jul 2016 19:15:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b=AWQFN2tl; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932508AbcGOJPX (ORCPT ); Fri, 15 Jul 2016 05:15:23 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34334 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932474AbcGOJPK (ORCPT ); Fri, 15 Jul 2016 05:15:10 -0400 Received: by mail-wm0-f66.google.com with SMTP id q128so1382534wma.1 for ; Fri, 15 Jul 2016 02:15:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mz04Yf5JFsN0F/xudH6BXo6flBLq/mXXbGje3vdaXAM=; b=AWQFN2tlXGJzvh15Rv2oZnJfMlH2K8PuCcJKyTIDxeIHrMKifyOPTS2KyLvCKN9ezx BJ1RNHu7YDNZ8wg7GWJeR4e90WqTUVIvIcG/Ftdn+c74EEolsVWX3R7TI5hr2VOKcL28 rv66vVoIuVP3y1BKKIS+pCwyhHbuRoe0cBrndqnjv5KemaW1ZBTdhZKgcsrM0C/bx2GY mFgMxfqNRJL43+yKA9zbNMSUj1tFQmA0+q+XLCicbElFIbhYqLDoYvJRzziiLagTUUYh uXUmjCo82jVcq9VAqwutR1iJ7G/opReNvrH35xfcU/PtjYafdvH/15cxATiBujMgkph4 05hw== 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=mz04Yf5JFsN0F/xudH6BXo6flBLq/mXXbGje3vdaXAM=; b=BM94ky/78FKWd84MgMCFoxLs72CC1UO8N+zCNsxOspJDFiz2pkgMJN/0/6jlRGbKpM TpSvNM+6u2ZllcE+Ct4C3GPHBIXUaYYhXGJbZg/Jg/gZjvu1ypifZp3QbxkG0N0YXCBn ubsxYbqLg9YdURp5gdg3tO5Js3cfcEFmdpaviJuafz1th9BiT04ZR88q2rlY5WyqU6kL xDcL7gTyELjBNV7qPOgrFCE1mzdkqCINfIRo2RK86fWY/XGzK9WXVZnAH6Go43fu5vJc zIbYmrWUSUjghPTv+radpQSpA4wJ1f76uIAn3YhIwdZ4004I5tFo6pOnakCLAUz5M4PY hkpw== X-Gm-Message-State: ALyK8tJeWOAGEwOWrByblHQLmnVPOwkyBdl1tUuPIELssFAHEMXj1J9J/8da5DOJq/2/uA== X-Received: by 10.28.197.66 with SMTP id v63mr5249444wmf.8.1468574109224; Fri, 15 Jul 2016 02:15:09 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id p83sm4719112wma.18.2016.07.15.02.15.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jul 2016 02:15:08 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, idosch@mellanox.com, eladr@mellanox.com, yotamg@mellanox.com, nogahf@mellanox.com, ogerlitz@mellanox.com Subject: [patch net 4/5] mlxsw: spectrum: Prevent overwrite of DCB capability fields Date: Fri, 15 Jul 2016 11:15:01 +0200 Message-Id: <1468574102-26288-5-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1468574102-26288-1-git-send-email-jiri@resnulli.us> References: <1468574102-26288-1-git-send-email-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ido Schimmel The number of supported traffic classes that can have ETS and PFC simultaneously enabled is not subject to user configuration, so make sure we always initialize them to the correct values following a set operation. Fixes: 8e8dfe9fdf06 ("mlxsw: spectrum: Add IEEE 802.1Qaz ETS support") Fixes: d81a6bdb87ce ("mlxsw: spectrum: Add IEEE 802.1Qbb PFC support") Signed-off-by: Ido Schimmel Signed-off-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c index 5d4b1e7..4af3f27 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c @@ -249,6 +249,7 @@ static int mlxsw_sp_dcbnl_ieee_setets(struct net_device *dev, return err; memcpy(mlxsw_sp_port->dcb.ets, ets, sizeof(*ets)); + mlxsw_sp_port->dcb.ets->ets_cap = IEEE_8021QAZ_MAX_TCS; return 0; } @@ -372,6 +373,7 @@ static int mlxsw_sp_dcbnl_ieee_setpfc(struct net_device *dev, } memcpy(mlxsw_sp_port->dcb.pfc, pfc, sizeof(*pfc)); + mlxsw_sp_port->dcb.pfc->pfc_cap = IEEE_8021QAZ_MAX_TCS; return 0;