1 files changed, 12 insertions, 7 deletions

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index eed1045e4d96..b65e274b02e9 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -862,8 +862,9 @@ int __mlxsw_sp_port_headroom_set(struct mlxsw_sp_port *mlxsw_sp_port, int mtu,
         for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
                 bool configure = false;
                 bool pfc = false;
+                u16 thres_cells;
+                u16 delay_cells;
                 bool lossy;
-                u16 thres;
 
                 for (j = 0; j < IEEE_8021QAZ_MAX_TCS; j++) {
                         if (prio_tc[j] == i) {
@@ -877,10 +878,11 @@ int __mlxsw_sp_port_headroom_set(struct mlxsw_sp_port *mlxsw_sp_port, int mtu,
                         continue;
 
                 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);
+                mlxsw_sp_pg_buf_pack(pbmc_pl, i, thres_cells + delay_cells,
+                                     thres_cells, lossy);
         }
 
         return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pbmc), pbmc_pl);
@@ -5005,12 +5007,15 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *lower_dev,
                                                            lower_dev,
                                                            upper_dev);
                 } else if (netif_is_lag_master(upper_dev)) {
-                        if (info->linking)
+                        if (info->linking) {
                                 err = mlxsw_sp_port_lag_join(mlxsw_sp_port,
                                                              upper_dev);
-                        else
+                        } else {
+                                mlxsw_sp_port_lag_tx_en_set(mlxsw_sp_port,
+                                                            false);
                                 mlxsw_sp_port_lag_leave(mlxsw_sp_port,
                                                         upper_dev);
+                        }
                 } else if (netif_is_ovs_master(upper_dev)) {
                         if (info->linking)
                                 err = mlxsw_sp_port_ovs_join(mlxsw_sp_port);