mlxsw: spectrum_matchall: Perform protocol check earlier

Perform the protocol check earlier in the function instead of repeating
it for every action. Example:

 # tc filter add dev swp1 ingress proto ip matchall skip_sw action sample group 1 rate 100
 Error: matchall rules only supported with 'all' protocol.
 We have an error talking to the kernel

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c
index ce58a795c6fcf303802083b9c3468362b65410de..9252e23fd082419355f75b63055f5b003e908dff 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c
@@ -238,6 +238,11 @@ int mlxsw_sp_mall_replace(struct mlxsw_sp *mlxsw_sp,
                flower_prio_valid = true;
        }
 
+       if (protocol != htons(ETH_P_ALL)) {
+               NL_SET_ERR_MSG(f->common.extack, "matchall rules only supported with 'all' protocol");
+               return -EOPNOTSUPP;
+       }
+
        mall_entry = kzalloc(sizeof(*mall_entry), GFP_KERNEL);
        if (!mall_entry)
                return -ENOMEM;
@@ -247,7 +252,7 @@ int mlxsw_sp_mall_replace(struct mlxsw_sp *mlxsw_sp,
 
        act = &f->rule->action.entries[0];
 
-       if (act->id == FLOW_ACTION_MIRRED && protocol == htons(ETH_P_ALL)) {
+       if (act->id == FLOW_ACTION_MIRRED) {
                if (flower_prio_valid && mall_entry->ingress &&
                    mall_entry->priority >= flower_min_prio) {
                        NL_SET_ERR_MSG(f->common.extack, "Failed to add behind existing flower rules");
@@ -262,8 +267,7 @@ int mlxsw_sp_mall_replace(struct mlxsw_sp *mlxsw_sp,
                }
                mall_entry->type = MLXSW_SP_MALL_ACTION_TYPE_MIRROR;
                mall_entry->mirror.to_dev = act->dev;
-       } else if (act->id == FLOW_ACTION_SAMPLE &&
-                  protocol == htons(ETH_P_ALL)) {
+       } else if (act->id == FLOW_ACTION_SAMPLE) {
                if (flower_prio_valid &&
                    mall_entry->priority >= flower_min_prio) {
                        NL_SET_ERR_MSG(f->common.extack, "Failed to add behind existing flower rules");