leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mlxsw: spectrum: Change name of mlxsw_sp_afk_blocks to mlxsw_sp1_afk_blocks

Browse Source 
This is specific for Spectrum as Spectrum-2 has completely different key
blocks.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2018-07-08 10:00:14 +03:00 committed by David S. Miller
parent 0dbc81eab4
commit d4b0d20fec
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c
View File

@ -837,8 +837,8 @@ int mlxsw_sp_acl_init(struct mlxsw_sp *mlxsw_sp)
acl->mlxsw_sp = mlxsw_sp; acl->mlxsw_sp = mlxsw_sp;
acl->afk = mlxsw_afk_create(MLXSW_CORE_RES_GET(mlxsw_sp->core, acl->afk = mlxsw_afk_create(MLXSW_CORE_RES_GET(mlxsw_sp->core,
ACL_FLEX_KEYS), ACL_FLEX_KEYS),
mlxsw_sp_afk_blocks, mlxsw_sp1_afk_blocks,
MLXSW_SP_AFK_BLOCKS_COUNT); MLXSW_SP1_AFK_BLOCKS_COUNT);
if (!acl->afk) { if (!acl->afk) {
err = -ENOMEM; err = -ENOMEM;
goto err_afk_create; goto err_afk_create;

4
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.h
View File

@ -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), 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(0x10, mlxsw_sp_afk_element_info_l2_dmac),
MLXSW_AFK_BLOCK(0x11, mlxsw_sp_afk_element_info_l2_smac), MLXSW_AFK_BLOCK(0x11, mlxsw_sp_afk_element_info_l2_smac),
MLXSW_AFK_BLOCK(0x12, mlxsw_sp_afk_element_info_l2_smac_ex), 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), 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 #endif