Commit eb38c205 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

can: rx-offload: rename can_rx_offload_queue_sorted() -> can_rx_offload_queue_timestamp() 

This patch renames the function can_rx_offload_queue_sorted() to
can_rx_offload_queue_timestamp(). This better describes what the
function does, it adds a newly RX'ed skb to the sorted queue by its
timestamp.

Link: https://lore.kernel.org/all/20220417194327.2699059-1-mkl@pengutronix.de


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent cc4bdef2

drivers/net/can/dev/rx-offload.c

+3 −3
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ int can_rx_offload_irq_offload_fifo(struct can_rx_offload *offload) 
}

EXPORT_SYMBOL_GPL(can_rx_offload_irq_offload_fifo);



int can_rx_offload_queue_sorted(struct can_rx_offload *offload,

int can_rx_offload_queue_timestamp(struct can_rx_offload *offload,

				struct sk_buff *skb, u32 timestamp)

{

	struct can_rx_offload_cb *cb;
@@ -240,7 +240,7 @@ int can_rx_offload_queue_sorted(struct can_rx_offload *offload, 


	return 0;

}

EXPORT_SYMBOL_GPL(can_rx_offload_queue_sorted);

EXPORT_SYMBOL_GPL(can_rx_offload_queue_timestamp);



unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload,

					 unsigned int idx, u32 timestamp,
@@ -256,7 +256,7 @@ unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload, 
	if (!skb)

		return 0;



	err = can_rx_offload_queue_sorted(offload, skb, timestamp);

	err = can_rx_offload_queue_timestamp(offload, skb, timestamp);

	if (err) {

		stats->rx_errors++;

		stats->tx_fifo_errors++;

drivers/net/can/flexcan/flexcan-core.c

+2 −2
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ static void flexcan_irq_bus_err(struct net_device *dev, u32 reg_esr) 
	if (tx_errors)

		dev->stats.tx_errors++;



	err = can_rx_offload_queue_sorted(&priv->offload, skb, timestamp);

	err = can_rx_offload_queue_timestamp(&priv->offload, skb, timestamp);

	if (err)

		dev->stats.rx_fifo_errors++;

}
@@ -892,7 +892,7 @@ static void flexcan_irq_state(struct net_device *dev, u32 reg_esr) 
	if (unlikely(new_state == CAN_STATE_BUS_OFF))

		can_bus_off(dev);



	err = can_rx_offload_queue_sorted(&priv->offload, skb, timestamp);

	err = can_rx_offload_queue_timestamp(&priv->offload, skb, timestamp);

	if (err)

		dev->stats.rx_fifo_errors++;

}

drivers/net/can/m_can/m_can.c

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static void m_can_receive_skb(struct m_can_classdev *cdev, 
		struct net_device_stats *stats = &cdev->net->stats;

		int err;



		err = can_rx_offload_queue_sorted(&cdev->offload, skb,

		err = can_rx_offload_queue_timestamp(&cdev->offload, skb,

						  timestamp);

		if (err)

			stats->rx_fifo_errors++;

drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c

+3 −3
Original line number Diff line number Diff line
@@ -916,7 +916,7 @@ static int mcp251xfd_handle_rxovif(struct mcp251xfd_priv *priv) 
	cf->can_id |= CAN_ERR_CRTL;

	cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;



	err = can_rx_offload_queue_sorted(&priv->offload, skb, timestamp);

	err = can_rx_offload_queue_timestamp(&priv->offload, skb, timestamp);

	if (err)

		stats->rx_fifo_errors++;
@@ -1021,7 +1021,7 @@ static int mcp251xfd_handle_ivmif(struct mcp251xfd_priv *priv) 
		return 0;



	mcp251xfd_skb_set_timestamp(priv, skb, timestamp);

	err = can_rx_offload_queue_sorted(&priv->offload, skb, timestamp);

	err = can_rx_offload_queue_timestamp(&priv->offload, skb, timestamp);

	if (err)

		stats->rx_fifo_errors++;
@@ -1094,7 +1094,7 @@ static int mcp251xfd_handle_cerrif(struct mcp251xfd_priv *priv) 
		cf->data[7] = bec.rxerr;

	}



	err = can_rx_offload_queue_sorted(&priv->offload, skb, timestamp);

	err = can_rx_offload_queue_timestamp(&priv->offload, skb, timestamp);

	if (err)

		stats->rx_fifo_errors++;

drivers/net/can/spi/mcp251xfd/mcp251xfd-rx.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ mcp251xfd_handle_rxif_one(struct mcp251xfd_priv *priv, 
	}



	mcp251xfd_hw_rx_obj_to_skb(priv, hw_rx_obj, skb);

	err = can_rx_offload_queue_sorted(&priv->offload, skb, hw_rx_obj->ts);

	err = can_rx_offload_queue_timestamp(&priv->offload, skb, hw_rx_obj->ts);

	if (err)

		stats->rx_fifo_errors++;