tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Marc Kleine-Budde <mkl@pengutronix.de>

Marc Kleine-Budde eb38c205 cc4bdef2

+14 -14
+3 -3
drivers/net/can/dev/rx-offload.c
··· 221 221 } 222 222 EXPORT_SYMBOL_GPL(can_rx_offload_irq_offload_fifo); 223 223 224 - int can_rx_offload_queue_sorted(struct can_rx_offload *offload, 224 + int can_rx_offload_queue_timestamp(struct can_rx_offload *offload, 225 225 struct sk_buff *skb, u32 timestamp) 226 226 { 227 227 struct can_rx_offload_cb *cb; ··· 240 240 241 241 return 0; 242 242 } 243 - EXPORT_SYMBOL_GPL(can_rx_offload_queue_sorted); 243 + EXPORT_SYMBOL_GPL(can_rx_offload_queue_timestamp); 244 244 245 245 unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload, 246 246 unsigned int idx, u32 timestamp, ··· 256 256 if (!skb) 257 257 return 0; 258 258 259 - err = can_rx_offload_queue_sorted(offload, skb, timestamp); 259 + err = can_rx_offload_queue_timestamp(offload, skb, timestamp); 260 260 if (err) { 261 261 stats->rx_errors++; 262 262 stats->tx_fifo_errors++;
+2 -2
drivers/net/can/flexcan/flexcan-core.c
··· 845 845 if (tx_errors) 846 846 dev->stats.tx_errors++; 847 847 848 - err = can_rx_offload_queue_sorted(&priv->offload, skb, timestamp); 848 + err = can_rx_offload_queue_timestamp(&priv->offload, skb, timestamp); 849 849 if (err) 850 850 dev->stats.rx_fifo_errors++; 851 851 } ··· 892 892 if (unlikely(new_state == CAN_STATE_BUS_OFF)) 893 893 can_bus_off(dev); 894 894 895 - err = can_rx_offload_queue_sorted(&priv->offload, skb, timestamp); 895 + err = can_rx_offload_queue_timestamp(&priv->offload, skb, timestamp); 896 896 if (err) 897 897 dev->stats.rx_fifo_errors++; 898 898 }
+1 -1
drivers/net/can/m_can/m_can.c
··· 464 464 struct net_device_stats *stats = &cdev->net->stats; 465 465 int err; 466 466 467 - err = can_rx_offload_queue_sorted(&cdev->offload, skb, 467 + err = can_rx_offload_queue_timestamp(&cdev->offload, skb, 468 468 timestamp); 469 469 if (err) 470 470 stats->rx_fifo_errors++;
+3 -3
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
··· 916 916 cf->can_id |= CAN_ERR_CRTL; 917 917 cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW; 918 918 919 - err = can_rx_offload_queue_sorted(&priv->offload, skb, timestamp); 919 + err = can_rx_offload_queue_timestamp(&priv->offload, skb, timestamp); 920 920 if (err) 921 921 stats->rx_fifo_errors++; 922 922 ··· 1021 1021 return 0; 1022 1022 1023 1023 mcp251xfd_skb_set_timestamp(priv, skb, timestamp); 1024 - err = can_rx_offload_queue_sorted(&priv->offload, skb, timestamp); 1024 + err = can_rx_offload_queue_timestamp(&priv->offload, skb, timestamp); 1025 1025 if (err) 1026 1026 stats->rx_fifo_errors++; 1027 1027 ··· 1094 1094 cf->data[7] = bec.rxerr; 1095 1095 } 1096 1096 1097 - err = can_rx_offload_queue_sorted(&priv->offload, skb, timestamp); 1097 + err = can_rx_offload_queue_timestamp(&priv->offload, skb, timestamp); 1098 1098 if (err) 1099 1099 stats->rx_fifo_errors++; 1100 1100
+1 -1
drivers/net/can/spi/mcp251xfd/mcp251xfd-rx.c
··· 173 173 } 174 174 175 175 mcp251xfd_hw_rx_obj_to_skb(priv, hw_rx_obj, skb); 176 - err = can_rx_offload_queue_sorted(&priv->offload, skb, hw_rx_obj->ts); 176 + err = can_rx_offload_queue_timestamp(&priv->offload, skb, hw_rx_obj->ts); 177 177 if (err) 178 178 stats->rx_fifo_errors++; 179 179
+2 -2
drivers/net/can/ti_hecc.c
··· 633 633 cf->data[3] = CAN_ERR_PROT_LOC_ACK; 634 634 635 635 timestamp = hecc_read(priv, HECC_CANLNT); 636 - err = can_rx_offload_queue_sorted(&priv->offload, skb, 636 + err = can_rx_offload_queue_timestamp(&priv->offload, skb, 637 637 timestamp); 638 638 if (err) 639 639 ndev->stats.rx_fifo_errors++; ··· 668 668 } 669 669 670 670 timestamp = hecc_read(priv, HECC_CANLNT); 671 - err = can_rx_offload_queue_sorted(&priv->offload, skb, timestamp); 671 + err = can_rx_offload_queue_timestamp(&priv->offload, skb, timestamp); 672 672 if (err) 673 673 ndev->stats.rx_fifo_errors++; 674 674 }
+2 -2
include/linux/can/rx-offload.h
··· 42 42 int can_rx_offload_irq_offload_timestamp(struct can_rx_offload *offload, 43 43 u64 reg); 44 44 int can_rx_offload_irq_offload_fifo(struct can_rx_offload *offload); 45 - int can_rx_offload_queue_sorted(struct can_rx_offload *offload, 46 - struct sk_buff *skb, u32 timestamp); 45 + int can_rx_offload_queue_timestamp(struct can_rx_offload *offload, 46 + struct sk_buff *skb, u32 timestamp); 47 47 unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload, 48 48 unsigned int idx, u32 timestamp, 49 49 unsigned int *frame_len_ptr);