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

Commit 6cf9dc8b authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: Use dev_level_ratelimited instead of net_ratelimit & dev_level 



Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18ea5445

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

+3 −4
Original line number Diff line number Diff line
@@ -431,8 +431,7 @@ static int mlxsw_pci_wqe_frag_map(struct mlxsw_pci *mlxsw_pci, char *wqe, 


	mapaddr = pci_map_single(pdev, frag_data, frag_len, direction);

	if (unlikely(pci_dma_mapping_error(pdev, mapaddr))) {

		if (net_ratelimit())

			dev_err(&pdev->dev, "failed to dma map tx frag\n");

		dev_err_ratelimited(&pdev->dev, "failed to dma map tx frag\n");

		return -EIO;

	}

	mlxsw_pci_wqe_address_set(wqe, index, mapaddr);
@@ -700,8 +699,8 @@ static void mlxsw_pci_cqe_rdq_handle(struct mlxsw_pci *mlxsw_pci, 
put_new_skb:

	memset(wqe, 0, q->elem_size);

	err = mlxsw_pci_rdq_skb_alloc(mlxsw_pci, elem_info);

	if (err && net_ratelimit())

		dev_dbg(&pdev->dev, "Failed to alloc skb for RDQ\n");

	if (err)

		dev_dbg_ratelimited(&pdev->dev, "Failed to alloc skb for RDQ\n");

	/* Everything is set up, ring doorbell to pass elem to HW */

	q->producer_counter++;

	mlxsw_pci_queue_doorbell_producer_ring(mlxsw_pci, q);

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

+2 −3
Original line number Diff line number Diff line
@@ -1210,8 +1210,7 @@ static void mlxsw_sx_rx_listener_func(struct sk_buff *skb, u8 local_port, 
	struct mlxsw_sx_port_pcpu_stats *pcpu_stats;



	if (unlikely(!mlxsw_sx_port)) {

		if (net_ratelimit())

			dev_warn(mlxsw_sx->bus_info->dev, "Port %d: skb received for non-existent port\n",

		dev_warn_ratelimited(mlxsw_sx->bus_info->dev, "Port %d: skb received for non-existent port\n",

				     local_port);

		return;

	}