Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-03-21 13:47:55 +0100
committerTakashi Iwai <tiwai@suse.de>2019-03-21 13:47:55 +0100
commit464fcbac9f0941111de4f697da4a097d4acd32b9 (patch)
treeede2b75eba799f2bacd6343c78806edb6ebc3724
parent112266d38f62ad8902a5d7c759dc7e4e05bf2421 (diff)
Fix a wrongly applied patch for mlxsw
Refresh patches.fixes/0001-mlxsw-__mlxsw_sp_port_headroom_set-Fix-a-use-of-loca.patch.
-rw-r--r--patches.fixes/0001-mlxsw-__mlxsw_sp_port_headroom_set-Fix-a-use-of-loca.patch13
1 files changed, 6 insertions, 7 deletions
diff --git a/patches.fixes/0001-mlxsw-__mlxsw_sp_port_headroom_set-Fix-a-use-of-loca.patch b/patches.fixes/0001-mlxsw-__mlxsw_sp_port_headroom_set-Fix-a-use-of-loca.patch
index 21c1f1ce62..7dec2bf154 100644
--- a/patches.fixes/0001-mlxsw-__mlxsw_sp_port_headroom_set-Fix-a-use-of-loca.patch
+++ b/patches.fixes/0001-mlxsw-__mlxsw_sp_port_headroom_set-Fix-a-use-of-loca.patch
@@ -20,8 +20,8 @@ Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Denis Kirjanov <dkirjanov@suse.com>
---
- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -36,20 +36,19 @@ Acked-by: Denis Kirjanov <dkirjanov@suse.com>
for (j = 0; j < IEEE_8021QAZ_MAX_TCS; j++) {
if (prio_tc[j] == i) {
-@@ -881,11 +882,11 @@ int __mlxsw_sp_port_headroom_set(struct
- if (!configure)
+@@ -882,10 +883,11 @@ int __mlxsw_sp_port_headroom_set(struct
continue;
-- lossy = !(pfc || pause_en);
+ lossy = !(pfc || pause_en);
- thres = mlxsw_sp_pg_buf_threshold_get(mlxsw_sp, mtu);
- delay = mlxsw_sp_pg_buf_delay_get(mlxsw_sp, mtu, delay, pfc,
- pause_en);
- mlxsw_sp_pg_buf_pack(pbmc_pl, i, thres + delay, thres, lossy);
+ thres_cells = mlxsw_sp_pg_buf_threshold_get(mlxsw_sp, mtu);
+ delay_cells = mlxsw_sp_pg_buf_delay_get(mlxsw_sp, mtu, delay,
-+ pfc, pause_en);
++ pfc, pause_en);
+ mlxsw_sp_pg_buf_pack(pbmc_pl, i, thres_cells + delay_cells,
-+ thres_cells, lossy);
++ thres_cells, lossy);
}
return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pbmc), pbmc_pl);