Skip to content

Commit 88840d6

Browse files
Amit Cohendavem330
Amit Cohen
authored and
davem330
committed
mlxsw: spectrum_fid: Remove '_ub_' indication from structures and defines
Some structures and defines were added with '_ub_' indication, as there were equivalent objects for the legacy model. Now when the legacy model is not used anymore, remove the '_ub_' indication. Signed-off-by: Amit Cohen <[email protected]> Reviewed-by: Petr Machata <[email protected]> Signed-off-by: Ido Schimmel <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 8928fd4 commit 88840d6

File tree

1 file changed

+47
-47
lines changed

1 file changed

+47
-47
lines changed

‎drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,11 +1077,11 @@ static const struct mlxsw_sp_fid_ops mlxsw_sp_fid_8021d_ops = {
10771077
};
10781078

10791079
#define MLXSW_SP_FID_8021Q_MAX (VLAN_N_VID - 2)
1080-
#define MLXSW_SP_FID_RFID_UB_MAX (11 * 1024)
1080+
#define MLXSW_SP_FID_RFID_MAX (11 * 1024)
10811081
#define MLXSW_SP_FID_8021Q_PGT_BASE 0
10821082
#define MLXSW_SP_FID_8021D_PGT_BASE (3 * MLXSW_SP_FID_8021Q_MAX)
10831083

1084-
static const struct mlxsw_sp_flood_table mlxsw_sp_fid_8021d_ub_flood_tables[] = {
1084+
static const struct mlxsw_sp_flood_table mlxsw_sp_fid_8021d_flood_tables[] = {
10851085
{
10861086
.packet_type = MLXSW_SP_FLOOD_TYPE_UC,
10871087
.table_type = MLXSW_REG_SFGC_TABLE_TYPE_FID_OFFSET,
@@ -1416,30 +1416,30 @@ static const struct mlxsw_sp_fid_ops mlxsw_sp_fid_8021q_ops = {
14161416
};
14171417

14181418
/* There are 4K-2 802.1Q FIDs */
1419-
#define MLXSW_SP_FID_8021Q_UB_START 1 /* FID 0 is reserved. */
1420-
#define MLXSW_SP_FID_8021Q_UB_END (MLXSW_SP_FID_8021Q_UB_START + \
1419+
#define MLXSW_SP_FID_8021Q_START 1 /* FID 0 is reserved. */
1420+
#define MLXSW_SP_FID_8021Q_END (MLXSW_SP_FID_8021Q_START + \
14211421
MLXSW_SP_FID_8021Q_MAX - 1)
14221422

14231423
/* There are 1K 802.1D FIDs */
1424-
#define MLXSW_SP_FID_8021D_UB_START (MLXSW_SP_FID_8021Q_UB_END + 1)
1425-
#define MLXSW_SP_FID_8021D_UB_END (MLXSW_SP_FID_8021D_UB_START + \
1424+
#define MLXSW_SP_FID_8021D_START (MLXSW_SP_FID_8021Q_END + 1)
1425+
#define MLXSW_SP_FID_8021D_END (MLXSW_SP_FID_8021D_START + \
14261426
MLXSW_SP_FID_8021D_MAX - 1)
14271427

14281428
/* There is one dummy FID */
1429-
#define MLXSW_SP_FID_DUMMY_UB (MLXSW_SP_FID_8021D_UB_END + 1)
1429+
#define MLXSW_SP_FID_DUMMY (MLXSW_SP_FID_8021D_END + 1)
14301430

14311431
/* There are 11K rFIDs */
1432-
#define MLXSW_SP_RFID_UB_START (MLXSW_SP_FID_DUMMY_UB + 1)
1433-
#define MLXSW_SP_RFID_UB_END (MLXSW_SP_RFID_UB_START + \
1434-
MLXSW_SP_FID_RFID_UB_MAX - 1)
1432+
#define MLXSW_SP_RFID_START (MLXSW_SP_FID_DUMMY + 1)
1433+
#define MLXSW_SP_RFID_END (MLXSW_SP_RFID_START + \
1434+
MLXSW_SP_FID_RFID_MAX - 1)
14351435

1436-
static const struct mlxsw_sp_fid_family mlxsw_sp1_fid_8021q_ub_family = {
1436+
static const struct mlxsw_sp_fid_family mlxsw_sp1_fid_8021q_family = {
14371437
.type = MLXSW_SP_FID_TYPE_8021Q,
14381438
.fid_size = sizeof(struct mlxsw_sp_fid_8021q),
1439-
.start_index = MLXSW_SP_FID_8021Q_UB_START,
1440-
.end_index = MLXSW_SP_FID_8021Q_UB_END,
1441-
.flood_tables = mlxsw_sp_fid_8021d_ub_flood_tables,
1442-
.nr_flood_tables = ARRAY_SIZE(mlxsw_sp_fid_8021d_ub_flood_tables),
1439+
.start_index = MLXSW_SP_FID_8021Q_START,
1440+
.end_index = MLXSW_SP_FID_8021Q_END,
1441+
.flood_tables = mlxsw_sp_fid_8021d_flood_tables,
1442+
.nr_flood_tables = ARRAY_SIZE(mlxsw_sp_fid_8021d_flood_tables),
14431443
.rif_type = MLXSW_SP_RIF_TYPE_VLAN,
14441444
.ops = &mlxsw_sp_fid_8021q_ops,
14451445
.flood_rsp = false,
@@ -1448,54 +1448,54 @@ static const struct mlxsw_sp_fid_family mlxsw_sp1_fid_8021q_ub_family = {
14481448
.smpe_index_valid = false,
14491449
};
14501450

1451-
static const struct mlxsw_sp_fid_family mlxsw_sp1_fid_8021d_ub_family = {
1451+
static const struct mlxsw_sp_fid_family mlxsw_sp1_fid_8021d_family = {
14521452
.type = MLXSW_SP_FID_TYPE_8021D,
14531453
.fid_size = sizeof(struct mlxsw_sp_fid_8021d),
1454-
.start_index = MLXSW_SP_FID_8021D_UB_START,
1455-
.end_index = MLXSW_SP_FID_8021D_UB_END,
1456-
.flood_tables = mlxsw_sp_fid_8021d_ub_flood_tables,
1457-
.nr_flood_tables = ARRAY_SIZE(mlxsw_sp_fid_8021d_ub_flood_tables),
1454+
.start_index = MLXSW_SP_FID_8021D_START,
1455+
.end_index = MLXSW_SP_FID_8021D_END,
1456+
.flood_tables = mlxsw_sp_fid_8021d_flood_tables,
1457+
.nr_flood_tables = ARRAY_SIZE(mlxsw_sp_fid_8021d_flood_tables),
14581458
.rif_type = MLXSW_SP_RIF_TYPE_FID,
14591459
.ops = &mlxsw_sp_fid_8021d_ops,
14601460
.bridge_type = MLXSW_REG_BRIDGE_TYPE_1,
14611461
.pgt_base = MLXSW_SP_FID_8021D_PGT_BASE,
14621462
.smpe_index_valid = false,
14631463
};
14641464

1465-
static const struct mlxsw_sp_fid_family mlxsw_sp1_fid_dummy_ub_family = {
1465+
static const struct mlxsw_sp_fid_family mlxsw_sp1_fid_dummy_family = {
14661466
.type = MLXSW_SP_FID_TYPE_DUMMY,
14671467
.fid_size = sizeof(struct mlxsw_sp_fid),
1468-
.start_index = MLXSW_SP_FID_DUMMY_UB,
1469-
.end_index = MLXSW_SP_FID_DUMMY_UB,
1468+
.start_index = MLXSW_SP_FID_DUMMY,
1469+
.end_index = MLXSW_SP_FID_DUMMY,
14701470
.ops = &mlxsw_sp_fid_dummy_ops,
14711471
.smpe_index_valid = false,
14721472
};
14731473

1474-
static const struct mlxsw_sp_fid_family mlxsw_sp_fid_rfid_ub_family = {
1474+
static const struct mlxsw_sp_fid_family mlxsw_sp_fid_rfid_family = {
14751475
.type = MLXSW_SP_FID_TYPE_RFID,
14761476
.fid_size = sizeof(struct mlxsw_sp_fid),
1477-
.start_index = MLXSW_SP_RFID_UB_START,
1478-
.end_index = MLXSW_SP_RFID_UB_END,
1477+
.start_index = MLXSW_SP_RFID_START,
1478+
.end_index = MLXSW_SP_RFID_END,
14791479
.rif_type = MLXSW_SP_RIF_TYPE_SUBPORT,
14801480
.ops = &mlxsw_sp_fid_rfid_ops,
14811481
.flood_rsp = true,
14821482
.smpe_index_valid = false,
14831483
};
14841484

14851485
const struct mlxsw_sp_fid_family *mlxsw_sp1_fid_family_arr[] = {
1486-
[MLXSW_SP_FID_TYPE_8021Q] = &mlxsw_sp1_fid_8021q_ub_family,
1487-
[MLXSW_SP_FID_TYPE_8021D] = &mlxsw_sp1_fid_8021d_ub_family,
1488-
[MLXSW_SP_FID_TYPE_DUMMY] = &mlxsw_sp1_fid_dummy_ub_family,
1489-
[MLXSW_SP_FID_TYPE_RFID] = &mlxsw_sp_fid_rfid_ub_family,
1486+
[MLXSW_SP_FID_TYPE_8021Q] = &mlxsw_sp1_fid_8021q_family,
1487+
[MLXSW_SP_FID_TYPE_8021D] = &mlxsw_sp1_fid_8021d_family,
1488+
[MLXSW_SP_FID_TYPE_DUMMY] = &mlxsw_sp1_fid_dummy_family,
1489+
[MLXSW_SP_FID_TYPE_RFID] = &mlxsw_sp_fid_rfid_family,
14901490
};
14911491

1492-
static const struct mlxsw_sp_fid_family mlxsw_sp2_fid_8021q_ub_family = {
1492+
static const struct mlxsw_sp_fid_family mlxsw_sp2_fid_8021q_family = {
14931493
.type = MLXSW_SP_FID_TYPE_8021Q,
14941494
.fid_size = sizeof(struct mlxsw_sp_fid_8021q),
1495-
.start_index = MLXSW_SP_FID_8021Q_UB_START,
1496-
.end_index = MLXSW_SP_FID_8021Q_UB_END,
1497-
.flood_tables = mlxsw_sp_fid_8021d_ub_flood_tables,
1498-
.nr_flood_tables = ARRAY_SIZE(mlxsw_sp_fid_8021d_ub_flood_tables),
1495+
.start_index = MLXSW_SP_FID_8021Q_START,
1496+
.end_index = MLXSW_SP_FID_8021Q_END,
1497+
.flood_tables = mlxsw_sp_fid_8021d_flood_tables,
1498+
.nr_flood_tables = ARRAY_SIZE(mlxsw_sp_fid_8021d_flood_tables),
14991499
.rif_type = MLXSW_SP_RIF_TYPE_VLAN,
15001500
.ops = &mlxsw_sp_fid_8021q_ops,
15011501
.flood_rsp = false,
@@ -1504,34 +1504,34 @@ static const struct mlxsw_sp_fid_family mlxsw_sp2_fid_8021q_ub_family = {
15041504
.smpe_index_valid = true,
15051505
};
15061506

1507-
static const struct mlxsw_sp_fid_family mlxsw_sp2_fid_8021d_ub_family = {
1507+
static const struct mlxsw_sp_fid_family mlxsw_sp2_fid_8021d_family = {
15081508
.type = MLXSW_SP_FID_TYPE_8021D,
15091509
.fid_size = sizeof(struct mlxsw_sp_fid_8021d),
1510-
.start_index = MLXSW_SP_FID_8021D_UB_START,
1511-
.end_index = MLXSW_SP_FID_8021D_UB_END,
1512-
.flood_tables = mlxsw_sp_fid_8021d_ub_flood_tables,
1513-
.nr_flood_tables = ARRAY_SIZE(mlxsw_sp_fid_8021d_ub_flood_tables),
1510+
.start_index = MLXSW_SP_FID_8021D_START,
1511+
.end_index = MLXSW_SP_FID_8021D_END,
1512+
.flood_tables = mlxsw_sp_fid_8021d_flood_tables,
1513+
.nr_flood_tables = ARRAY_SIZE(mlxsw_sp_fid_8021d_flood_tables),
15141514
.rif_type = MLXSW_SP_RIF_TYPE_FID,
15151515
.ops = &mlxsw_sp_fid_8021d_ops,
15161516
.bridge_type = MLXSW_REG_BRIDGE_TYPE_1,
15171517
.pgt_base = MLXSW_SP_FID_8021D_PGT_BASE,
15181518
.smpe_index_valid = true,
15191519
};
15201520

1521-
static const struct mlxsw_sp_fid_family mlxsw_sp2_fid_dummy_ub_family = {
1521+
static const struct mlxsw_sp_fid_family mlxsw_sp2_fid_dummy_family = {
15221522
.type = MLXSW_SP_FID_TYPE_DUMMY,
15231523
.fid_size = sizeof(struct mlxsw_sp_fid),
1524-
.start_index = MLXSW_SP_FID_DUMMY_UB,
1525-
.end_index = MLXSW_SP_FID_DUMMY_UB,
1524+
.start_index = MLXSW_SP_FID_DUMMY,
1525+
.end_index = MLXSW_SP_FID_DUMMY,
15261526
.ops = &mlxsw_sp_fid_dummy_ops,
15271527
.smpe_index_valid = false,
15281528
};
15291529

15301530
const struct mlxsw_sp_fid_family *mlxsw_sp2_fid_family_arr[] = {
1531-
[MLXSW_SP_FID_TYPE_8021Q] = &mlxsw_sp2_fid_8021q_ub_family,
1532-
[MLXSW_SP_FID_TYPE_8021D] = &mlxsw_sp2_fid_8021d_ub_family,
1533-
[MLXSW_SP_FID_TYPE_DUMMY] = &mlxsw_sp2_fid_dummy_ub_family,
1534-
[MLXSW_SP_FID_TYPE_RFID] = &mlxsw_sp_fid_rfid_ub_family,
1531+
[MLXSW_SP_FID_TYPE_8021Q] = &mlxsw_sp2_fid_8021q_family,
1532+
[MLXSW_SP_FID_TYPE_8021D] = &mlxsw_sp2_fid_8021d_family,
1533+
[MLXSW_SP_FID_TYPE_DUMMY] = &mlxsw_sp2_fid_dummy_family,
1534+
[MLXSW_SP_FID_TYPE_RFID] = &mlxsw_sp_fid_rfid_family,
15351535
};
15361536

15371537
static struct mlxsw_sp_fid *mlxsw_sp_fid_lookup(struct mlxsw_sp *mlxsw_sp,

0 commit comments

Comments
 (0)