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

Commit ae8e1d5e authored by Maxime Chevallier's avatar Maxime Chevallier Committed by David S. Miller
Browse files

net: mvpp2: cls: Use the correct number of rules in various places 



As of today, the classification offload implementation only supports 4
different rules to be offloaded. This number has been hardcoded in the
rule insertion function, and the wrong define is being used elsewhere.

Use the correct #define everywhere to make sure we always check for the
correct number of rules.

Signed-off-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6dca9360

drivers/net/ethernet/marvell/mvpp2/mvpp2.h

+1 −1
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ struct mvpp2_port { 
	u32 indir[MVPP22_RSS_TABLE_ENTRIES];



	/* List of steering rules active on that port */

	struct mvpp2_ethtool_fs *rfs_rules[MVPP2_N_RFS_RULES];

	struct mvpp2_ethtool_fs *rfs_rules[MVPP2_N_RFS_ENTRIES_PER_FLOW];

	int n_rfs_rules;

};

drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c

+2 −2
Original line number Diff line number Diff line
@@ -1212,7 +1212,7 @@ int mvpp2_ethtool_cls_rule_get(struct mvpp2_port *port, 
{

	struct mvpp2_ethtool_fs *efs;



	if (rxnfc->fs.location >= MVPP2_N_RFS_RULES)

	if (rxnfc->fs.location >= MVPP2_N_RFS_ENTRIES_PER_FLOW)

		return -EINVAL;



	efs = port->rfs_rules[rxnfc->fs.location];
@@ -1232,7 +1232,7 @@ int mvpp2_ethtool_cls_rule_ins(struct mvpp2_port *port, 
	struct mvpp2_ethtool_fs *efs, *old_efs;

	int ret = 0;



	if (info->fs.location >= 4 ||

	if (info->fs.location >= MVPP2_N_RFS_ENTRIES_PER_FLOW ||

	    info->fs.location < 0)

		return -EINVAL;

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3956,7 +3956,7 @@ static int mvpp2_ethtool_get_rxnfc(struct net_device *dev, 
		ret = mvpp2_ethtool_cls_rule_get(port, info);

		break;

	case ETHTOOL_GRXCLSRLALL:

		for (i = 0; i < MVPP2_N_RFS_RULES; i++) {

		for (i = 0; i < MVPP2_N_RFS_ENTRIES_PER_FLOW; i++) {

			if (port->rfs_rules[i])

				rules[loc++] = i;

		}