OSDN Git Service

mlxsw: spectrum: qdiscs: Make the clean stats function to be for RED only
authorNogah Frankel <nogahf@mellanox.com>
Wed, 10 Jan 2018 14:00:01 +0000 (15:00 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 10 Jan 2018 21:07:40 +0000 (16:07 -0500)
Improve readability by changing the clean stats function to handle only
RED. Qdiscs that will be offloaded in the future will have a clean stats
function of their own.

Signed-off-by: Nogah Frankel <nogahf@mellanox.com>
Reviewed-by: Yuval Mintz <yuvalm@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c

index 0b6e553..6f7687b 100644 (file)
@@ -98,9 +98,9 @@ mlxsw_sp_tclass_congestion_disable(struct mlxsw_sp_port *mlxsw_sp_port,
 }
 
 static void
-mlxsw_sp_setup_tc_qdisc_clean_stats(struct mlxsw_sp_port *mlxsw_sp_port,
-                                   struct mlxsw_sp_qdisc *mlxsw_sp_qdisc,
-                                   int tclass_num)
+mlxsw_sp_setup_tc_qdisc_red_clean_stats(struct mlxsw_sp_port *mlxsw_sp_port,
+                                       struct mlxsw_sp_qdisc *mlxsw_sp_qdisc,
+                                       int tclass_num)
 {
        struct mlxsw_sp_qdisc_stats *stats_base;
        struct mlxsw_sp_port_xstats *xstats;
@@ -110,24 +110,17 @@ mlxsw_sp_setup_tc_qdisc_clean_stats(struct mlxsw_sp_port *mlxsw_sp_port,
        xstats = &mlxsw_sp_port->periodic_hw_stats.xstats;
        stats = &mlxsw_sp_port->periodic_hw_stats.stats;
        stats_base = &mlxsw_sp_qdisc->stats_base;
+       red_base = &mlxsw_sp_qdisc->xstats_base.red;
 
        stats_base->tx_packets = stats->tx_packets;
        stats_base->tx_bytes = stats->tx_bytes;
 
-       switch (mlxsw_sp_qdisc->type) {
-       case MLXSW_SP_QDISC_RED:
-               red_base = &mlxsw_sp_qdisc->xstats_base.red;
-               red_base->prob_mark = xstats->ecn;
-               red_base->prob_drop = xstats->wred_drop[tclass_num];
-               red_base->pdrop = xstats->tail_drop[tclass_num];
-
-               stats_base->overlimits = red_base->prob_drop +
-                                        red_base->prob_mark;
-               stats_base->drops = red_base->prob_drop + red_base->pdrop;
-               break;
-       default:
-               break;
-       }
+       red_base->prob_mark = xstats->ecn;
+       red_base->prob_drop = xstats->wred_drop[tclass_num];
+       red_base->pdrop = xstats->tail_drop[tclass_num];
+
+       stats_base->overlimits = red_base->prob_drop + red_base->prob_mark;
+       stats_base->drops = red_base->prob_drop + red_base->pdrop;
 }
 
 static int
@@ -189,9 +182,9 @@ mlxsw_sp_qdisc_red_replace(struct mlxsw_sp_port *mlxsw_sp_port, u32 handle,
 
        mlxsw_sp_qdisc->type = MLXSW_SP_QDISC_RED;
        if (mlxsw_sp_qdisc->handle != handle)
-               mlxsw_sp_setup_tc_qdisc_clean_stats(mlxsw_sp_port,
-                                                   mlxsw_sp_qdisc,
-                                                   tclass_num);
+               mlxsw_sp_setup_tc_qdisc_red_clean_stats(mlxsw_sp_port,
+                                                       mlxsw_sp_qdisc,
+                                                       tclass_num);
 
        mlxsw_sp_qdisc->handle = handle;
        return 0;