mlxsw: spectrum_qdisc: Simplify mlxsw_sp_qdisc_compare()

The purpose of this function is to filter out events that are related to
qdiscs that are not offloaded, or are not offloaded anymore. But the
function is unnecessarily thorough:

- mlxsw_sp_qdisc pointer is never NULL in the context where it is called
- Two qdiscs with the same handle will never have different types. Even
  when replacing one qdisc with another in the same class, Linux will not
  permit handle reuse unless the qdisc type also matches.

Simplify the function by omitting these two unnecessary conditions.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
index 644ffc021abea829eaef46e1f36377fb23ec7f1b..013398ecd15b18d930617a9898f8792863559592 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
@@ -87,12 +87,9 @@ struct mlxsw_sp_qdisc_state {
 };
 
 static bool
-mlxsw_sp_qdisc_compare(struct mlxsw_sp_qdisc *mlxsw_sp_qdisc, u32 handle,
-                      enum mlxsw_sp_qdisc_type type)
+mlxsw_sp_qdisc_compare(struct mlxsw_sp_qdisc *mlxsw_sp_qdisc, u32 handle)
 {
-       return mlxsw_sp_qdisc && mlxsw_sp_qdisc->ops &&
-              mlxsw_sp_qdisc->ops->type == type &&
-              mlxsw_sp_qdisc->handle == handle;
+       return mlxsw_sp_qdisc->ops && mlxsw_sp_qdisc->handle == handle;
 }
 
 static struct mlxsw_sp_qdisc *
@@ -579,8 +576,7 @@ int mlxsw_sp_setup_tc_red(struct mlxsw_sp_port *mlxsw_sp_port,
                                              &mlxsw_sp_qdisc_ops_red,
                                              &p->set);
 
-       if (!mlxsw_sp_qdisc_compare(mlxsw_sp_qdisc, p->handle,
-                                   MLXSW_SP_QDISC_RED))
+       if (!mlxsw_sp_qdisc_compare(mlxsw_sp_qdisc, p->handle))
                return -EOPNOTSUPP;
 
        switch (p->command) {
@@ -780,8 +776,7 @@ int mlxsw_sp_setup_tc_tbf(struct mlxsw_sp_port *mlxsw_sp_port,
                                              &mlxsw_sp_qdisc_ops_tbf,
                                              &p->replace_params);
 
-       if (!mlxsw_sp_qdisc_compare(mlxsw_sp_qdisc, p->handle,
-                                   MLXSW_SP_QDISC_TBF))
+       if (!mlxsw_sp_qdisc_compare(mlxsw_sp_qdisc, p->handle))
                return -EOPNOTSUPP;
 
        switch (p->command) {
@@ -886,8 +881,7 @@ int mlxsw_sp_setup_tc_fifo(struct mlxsw_sp_port *mlxsw_sp_port,
                                              &mlxsw_sp_qdisc_ops_fifo, NULL);
        }
 
-       if (!mlxsw_sp_qdisc_compare(mlxsw_sp_qdisc, p->handle,
-                                   MLXSW_SP_QDISC_FIFO))
+       if (!mlxsw_sp_qdisc_compare(mlxsw_sp_qdisc, p->handle))
                return -EOPNOTSUPP;
 
        switch (p->command) {
@@ -1247,8 +1241,7 @@ int mlxsw_sp_setup_tc_prio(struct mlxsw_sp_port *mlxsw_sp_port,
                                              &mlxsw_sp_qdisc_ops_prio,
                                              &p->replace_params);
 
-       if (!mlxsw_sp_qdisc_compare(mlxsw_sp_qdisc, p->handle,
-                                   MLXSW_SP_QDISC_PRIO))
+       if (!mlxsw_sp_qdisc_compare(mlxsw_sp_qdisc, p->handle))
                return -EOPNOTSUPP;
 
        switch (p->command) {
@@ -1280,8 +1273,7 @@ int mlxsw_sp_setup_tc_ets(struct mlxsw_sp_port *mlxsw_sp_port,
                                              &mlxsw_sp_qdisc_ops_ets,
                                              &p->replace_params);
 
-       if (!mlxsw_sp_qdisc_compare(mlxsw_sp_qdisc, p->handle,
-                                   MLXSW_SP_QDISC_ETS))
+       if (!mlxsw_sp_qdisc_compare(mlxsw_sp_qdisc, p->handle))
                return -EOPNOTSUPP;
 
        switch (p->command) {