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: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
index 6171270a016c6708db1d346cc71ae320b03eae99..d5df813e08c4331ad96f20a057904a2557c7f813 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
@@ -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;
 };
 

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
index d046f7a1dcf5a556cc3ebc83af057a339f830409..9ce73297276e7b4afe1e3cf7b2e70cf1d4b3e8b4 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
@@ -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;
 

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index d38952eb7aa98ea460d6911d8e769b36bf00a97c..8432315447dd884bd1eca7b5cfa957635e22a38a 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -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;
                }