Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a383b7f0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-fixes' 



Jiri Pirko says:

====================
mlxsw: couple of fixes

Couple of fixes from Ido.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4de13d7e 5091730d

drivers/net/ethernet/mellanox/mlxsw/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ mlxsw_pci_queue_elem_info_producer_get(struct mlxsw_pci_queue *q) 
{

	int index = q->producer_counter & (q->count - 1);



	if ((q->producer_counter - q->consumer_counter) == q->count)

	if ((u16) (q->producer_counter - q->consumer_counter) == q->count)

		return NULL;

	return mlxsw_pci_queue_elem_info_get(q, index);

}

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+1 −3
Original line number Diff line number Diff line
@@ -2358,8 +2358,6 @@ static int mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port, 
	if (mlxsw_sp_port->bridged) {

		mlxsw_sp_port_active_vlans_del(mlxsw_sp_port);

		mlxsw_sp_port_bridge_leave(mlxsw_sp_port, false);



		if (lag->ref_count == 1)

		mlxsw_sp_master_bridge_dec(mlxsw_sp, NULL);

	}