From patchwork Thu Jun 14 08:37:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 10463599 X-Patchwork-Delegate: idosch@idosch.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 45D47603EE for ; Thu, 14 Jun 2018 08:38:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3705F28892 for ; Thu, 14 Jun 2018 08:38:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B2DF2892D; Thu, 14 Jun 2018 08:38:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 106AE28892 for ; Thu, 14 Jun 2018 08:38:03 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 415xpK4n7GzDrph for ; Thu, 14 Jun 2018 18:38:01 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=resnulli.us Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="iRoIfjhs"; dkim-atps=neutral X-Original-To: linux-mlxsw@lists.ozlabs.org Delivered-To: linux-mlxsw@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (mailfrom) smtp.mailfrom=resnulli.us (client-ip=2a00:1450:400c:c0c::242; helo=mail-wr0-x242.google.com; envelope-from=jiri@resnulli.us; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=resnulli.us Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="iRoIfjhs"; dkim-atps=neutral Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 415xpF4CyDzDrpC for ; Thu, 14 Jun 2018 18:37:56 +1000 (AEST) Received: by mail-wr0-x242.google.com with SMTP id d2-v6so5430956wrm.10 for ; Thu, 14 Jun 2018 01:37:56 -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=YS3Gad7W/RGuzRviei9X1ob5E6pew0dXTsKNQ8TovTw=; b=iRoIfjhst9LjCN31nPgmpHjogbiHIZWhhpovvO/1v6Td26U7Snge23VYJSkJHYTtoc nA2lAInDCHEfT8rOpDq7QJFWHA/s79n+L9Rjq09TCTyxeDpjPXI5pFm44W1uwbugggE5 4s+OVln5zz/MnfX4uChzs8N7BJAmbw5D9DIMfWAeh4cmiJmQmGwtzkO2kjoueNxBHw6A xCXwDkFAorf0rkyWCZoBxwjqfVV88iMe0FL1rV2zcDZh1SI//NVgNrGIX8tMTRmgx1nU ZYnsPecJjdkM4A/sqv7GK1FAwo/rUX8HuL2OPgYHnnyAx0VO3wS4CuUzQ6dckzM8SklF YpHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YS3Gad7W/RGuzRviei9X1ob5E6pew0dXTsKNQ8TovTw=; b=tg9Okxe9ZWW6/ZTKimbXNMJfBCREIWvgcp0rb1pZZD8N/uPfCfOfyGkTqCPjcMb7wN GqymC7n14fiGqXuWLlsKet0MZ2MPRd4oc/JHizx+WdXrDcUQ7w2GnjpTEvk2w1aoE+OW YXE8rWeLt4dn1FJ/DadQlVyPbpS+6nVve3cLLyqgDcDUmS3FVsasfo2TT4yCbR+5L3qE RRFFb4xeZMNWWgprucFNBRhDSl7FJL8AEP6QmTobN4k8qT14rEro/Jqf8K1dEznZNv7W YL94+i4/yAJ+BDBQjDLRjuZIFmgnX9I+/JVGmUu5VcOr/pDbYCYmObqYXQylnJ1uRL09 QV5Q== X-Gm-Message-State: APt69E2RmX0oXBXzujjIVMZcO8pfm80DqwCCTmOpJXwirKs6PHQnNQY7 Er2WahwQfhkRp3TQ1Dfmrwt46g== X-Google-Smtp-Source: ADUXVKJuE9Tk9D3mxlz0N06hYLeainaqqrQQgzThV2p5JorYlg5Goj0UK8nJpuCiLbonOheP82iAtA== X-Received: by 2002:adf:d4c5:: with SMTP id w5-v6mr1231820wrk.185.1528965473906; Thu, 14 Jun 2018 01:37:53 -0700 (PDT) Received: from localhost ([83.167.225.161]) by smtp.gmail.com with ESMTPSA id y186-v6sm6761192wmd.38.2018.06.14.01.37.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Jun 2018 01:37:53 -0700 (PDT) From: Jiri Pirko To: linux-internal@mellanox.com Subject: [patch net-next/mlxsw internal 1/8] mlxsw: spectrum: Change name of mlxsw_sp_afk_blocks to mlxsw_sp1_afk_blocks Date: Thu, 14 Jun 2018 10:37:42 +0200 Message-Id: <20180614083749.1592-2-jiri@resnulli.us> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180614083749.1592-1-jiri@resnulli.us> References: <20180614083749.1592-1-jiri@resnulli.us> X-BeenThere: linux-mlxsw@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: mlxsw driver development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linux-mlxsw-bounces+patchwork-linux-mlxsw=patchwork.kernel.org@lists.ozlabs.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jiri Pirko This is specific for Spectrum1 as Spectrum1 has completely different key blocks. Signed-off-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 4 ++-- drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c index 79b1fa27a9a4..da93b7fbb836 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c @@ -837,8 +837,8 @@ int mlxsw_sp_acl_init(struct mlxsw_sp *mlxsw_sp) acl->mlxsw_sp = mlxsw_sp; acl->afk = mlxsw_afk_create(MLXSW_CORE_RES_GET(mlxsw_sp->core, ACL_FLEX_KEYS), - mlxsw_sp_afk_blocks, - MLXSW_SP_AFK_BLOCKS_COUNT); + mlxsw_sp1_afk_blocks, + MLXSW_SP1_AFK_BLOCKS_COUNT); if (!acl->afk) { err = -ENOMEM; goto err_afk_create; diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h index fb8031828454..f2924ef98083 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h @@ -104,7 +104,7 @@ static struct mlxsw_afk_element_inst mlxsw_sp_afk_element_info_packet_type[] = { MLXSW_AFK_ELEMENT_INST_U32(ETHERTYPE, 0x00, 0, 16), }; -static const struct mlxsw_afk_block mlxsw_sp_afk_blocks[] = { +static const struct mlxsw_afk_block mlxsw_sp1_afk_blocks[] = { MLXSW_AFK_BLOCK(0x10, mlxsw_sp_afk_element_info_l2_dmac), MLXSW_AFK_BLOCK(0x11, mlxsw_sp_afk_element_info_l2_smac), MLXSW_AFK_BLOCK(0x12, mlxsw_sp_afk_element_info_l2_smac_ex), @@ -119,6 +119,6 @@ static const struct mlxsw_afk_block mlxsw_sp_afk_blocks[] = { MLXSW_AFK_BLOCK(0xB0, mlxsw_sp_afk_element_info_packet_type), }; -#define MLXSW_SP_AFK_BLOCKS_COUNT ARRAY_SIZE(mlxsw_sp_afk_blocks) +#define MLXSW_SP1_AFK_BLOCKS_COUNT ARRAY_SIZE(mlxsw_sp1_afk_blocks) #endif