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

can: rx-offload: rename rx_offload_get_echo_skb() -> can_rx_offload_get_echo_skb_queue_timestamp() 

Rename the rx_offload_get_echo_skb() function to
can_rx_offload_get_echo_skb_queue_timestamp(), since it inserts the
echo skb into the rx-offload queue sorted by timestamp.

This is a preparation for adding
can_rx_offload_get_echo_skb_queue_tail(), which adds the echo skb to
the end of the queue. This is intended for devices that do not support
timestamps.

Link: https://lore.kernel.org/all/20230718-gs_usb-rx-offload-v2-1-716e542d14d5@pengutronix.de


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

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

+5 −4
Original line number Diff line number Diff line
@@ -240,7 +240,8 @@ int can_rx_offload_queue_timestamp(struct can_rx_offload *offload, 
}

EXPORT_SYMBOL_GPL(can_rx_offload_queue_timestamp);



unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload,

unsigned int

can_rx_offload_get_echo_skb_queue_timestamp(struct can_rx_offload *offload,

					    unsigned int idx, u32 timestamp,

					    unsigned int *frame_len_ptr)

{
@@ -262,7 +263,7 @@ unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload, 


	return len;

}

EXPORT_SYMBOL_GPL(can_rx_offload_get_echo_skb);

EXPORT_SYMBOL_GPL(can_rx_offload_get_echo_skb_queue_timestamp);



int can_rx_offload_queue_tail(struct can_rx_offload *offload,

			      struct sk_buff *skb)

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

+2 −2
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id) 


		handled = IRQ_HANDLED;

		stats->tx_bytes +=

			can_rx_offload_get_echo_skb(&priv->offload, 0,

			can_rx_offload_get_echo_skb_queue_timestamp(&priv->offload, 0,

								    reg_ctrl << 16, NULL);

		stats->tx_packets++;

drivers/net/can/m_can/m_can.c

+4 −4
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ static void m_can_tx_update_stats(struct m_can_classdev *cdev, 


	if (cdev->is_peripheral)

		stats->tx_bytes +=

			can_rx_offload_get_echo_skb(&cdev->offload,

			can_rx_offload_get_echo_skb_queue_timestamp(&cdev->offload,

								    msg_mark,

								    timestamp,

								    NULL);

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

+3 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ mcp251xfd_handle_tefif_one(struct mcp251xfd_priv *priv, 
	if (skb)

		mcp251xfd_skb_set_timestamp(priv, skb, hw_tef_obj->ts);

	stats->tx_bytes +=

		can_rx_offload_get_echo_skb(&priv->offload,

		can_rx_offload_get_echo_skb_queue_timestamp(&priv->offload,

							    tef_tail, hw_tef_obj->ts,

							    frame_len_ptr);

	stats->tx_packets++;

drivers/net/can/ti_hecc.c

+2 −2
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ static irqreturn_t ti_hecc_interrupt(int irq, void *dev_id) 
			spin_unlock_irqrestore(&priv->mbx_lock, flags);

			stamp = hecc_read_stamp(priv, mbxno);

			stats->tx_bytes +=

				can_rx_offload_get_echo_skb(&priv->offload,

				can_rx_offload_get_echo_skb_queue_timestamp(&priv->offload,

									    mbxno, stamp, NULL);

			stats->tx_packets++;

			--priv->tx_tail;