Commit 8ba00e24 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'More-incorrect-VCAP-offsets-for-mscc_ocelot-switch' 



Vladimir Oltean says:

====================
More incorrect VCAP offsets for mscc_ocelot switch

This small series fixes some wrong tc-flower action fields in the
Seville and Felix DSA drivers.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bbc4d71d eaa0355c

drivers/net/dsa/ocelot/felix_vsc9959.c

+6 −6
Original line number Diff line number Diff line
@@ -685,12 +685,12 @@ static struct vcap_field vsc9959_vcap_is2_actions[] = { 
	[VCAP_IS2_ACT_POLICE_ENA]		= {  9,  1},

	[VCAP_IS2_ACT_POLICE_IDX]		= { 10,  9},

	[VCAP_IS2_ACT_POLICE_VCAP_ONLY]		= { 19,  1},

	[VCAP_IS2_ACT_PORT_MASK]		= { 20, 11},

	[VCAP_IS2_ACT_REW_OP]			= { 31,  9},

	[VCAP_IS2_ACT_SMAC_REPLACE_ENA]		= { 40,  1},

	[VCAP_IS2_ACT_RSV]			= { 41,  2},

	[VCAP_IS2_ACT_ACL_ID]			= { 43,  6},

	[VCAP_IS2_ACT_HIT_CNT]			= { 49, 32},

	[VCAP_IS2_ACT_PORT_MASK]		= { 20,  6},

	[VCAP_IS2_ACT_REW_OP]			= { 26,  9},

	[VCAP_IS2_ACT_SMAC_REPLACE_ENA]		= { 35,  1},

	[VCAP_IS2_ACT_RSV]			= { 36,  2},

	[VCAP_IS2_ACT_ACL_ID]			= { 38,  6},

	[VCAP_IS2_ACT_HIT_CNT]			= { 44, 32},

};



static const struct vcap_props vsc9959_vcap_props[] = {

drivers/net/dsa/ocelot/seville_vsc9953.c

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static const struct vcap_props vsc9953_vcap_props[] = { 
		.action_type_width = 1,

		.action_table = {

			[IS2_ACTION_TYPE_NORMAL] = {

				.width = 44,

				.width = 50, /* HIT_CNT not included */

				.count = 2

			},

			[IS2_ACTION_TYPE_SMAC_SIP] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE