Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6049e539 authored by Arkadi Sharshevsky's avatar Arkadi Sharshevsky Committed by David S. Miller
Browse files

mlxsw: spectrum_dpipe: Make host entry fill handler more generic 



Change the host entry filler helper to be applicable for both IPv4/6
addresses.

Signed-off-by: default avatarArkadi Sharshevsky <arkadis@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0250768c

drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c

+5 −8
Original line number Diff line number Diff line
@@ -439,13 +439,12 @@ mlxsw_sp_dpipe_table_host_entry_prepare(struct devlink_dpipe_entry *entry, 
}



static void

__mlxsw_sp_dpipe_table_host4_entry_fill(struct devlink_dpipe_entry *entry,

__mlxsw_sp_dpipe_table_host_entry_fill(struct devlink_dpipe_entry *entry,

				       struct mlxsw_sp_rif *rif,

					unsigned char *ha, u32 dip)

				       unsigned char *ha, void *dip)

{

	struct devlink_dpipe_value *value;

	u32 *rif_value;

	u32 *dip_value;

	u8 *ha_value;



	/* Set Match RIF index */
@@ -458,9 +457,7 @@ __mlxsw_sp_dpipe_table_host4_entry_fill(struct devlink_dpipe_entry *entry, 


	/* Set Match DIP */

	value = &entry->match_values[MLXSW_SP_DPIPE_TABLE_HOST_MATCH_DIP];



	dip_value = value->value;

	*dip_value = dip;

	memcpy(value->value, dip, value->value_size);



	/* Set Action DMAC */

	value = entry->action_values;
@@ -478,7 +475,7 @@ mlxsw_sp_dpipe_table_host4_entry_fill(struct devlink_dpipe_entry *entry, 


	ha = mlxsw_sp_neigh_entry_ha(neigh_entry);

	dip = mlxsw_sp_neigh4_entry_dip(neigh_entry);

	__mlxsw_sp_dpipe_table_host4_entry_fill(entry, rif, ha, dip);

	__mlxsw_sp_dpipe_table_host_entry_fill(entry, rif, ha, &dip);

}



static void