net: dsa: felix: fix incorrect clamp calculation for burst
authorColin Ian King <colin.king@canonical.com>
Thu, 14 May 2020 18:33:02 +0000 (19:33 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 15 May 2020 01:02:02 +0000 (18:02 -0700)
Currently burst is clamping on rate and not burst, the assignment
of burst from the clamping discards the previous assignment of burst.
This looks like a cut-n-paste error from the previous clamping
calculation on ramp.  Fix this by replacing ramp with burst.

Addresses-Coverity: ("Unused value")
Fixes: 0fbabf875d18 ("net: dsa: felix: add support Credit Based Shaper(CBS) for hardware offload")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/ocelot/felix_vsc9959.c

index df4498c..85e34d8 100644 (file)
@@ -1360,7 +1360,7 @@ static int vsc9959_qos_port_cbs_set(struct dsa_switch *ds, int port,
        /* Burst unit is 4kB */
        burst = DIV_ROUND_UP(cbs_qopt->hicredit, 4096);
        /* Avoid using zero burst size */
-       burst = clamp_t(u32, rate, 1, GENMASK(5, 0));
+       burst = clamp_t(u32, burst, 1, GENMASK(5, 0));
        ocelot_write_gix(ocelot,
                         QSYS_CIR_CFG_CIR_RATE(rate) |
                         QSYS_CIR_CFG_CIR_BURST(burst),