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

Commit 4530ec36 authored by Oleksij Rempel's avatar Oleksij Rempel Committed by Marc Kleine-Budde
Browse files

can: rx-offload: rename can_rx_offload_irq_queue_err_skb() to can_rx_offload_queue_tail() 



This function has nothing todo with error.

Signed-off-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent ed72bc8b

drivers/net/can/flexcan.c

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

		dev->stats.tx_errors++;



	can_rx_offload_irq_queue_err_skb(&priv->offload, skb);

	can_rx_offload_queue_tail(&priv->offload, skb);

}



static void flexcan_irq_state(struct net_device *dev, u32 reg_esr)
@@ -650,7 +650,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);



	can_rx_offload_irq_queue_err_skb(&priv->offload, skb);

	can_rx_offload_queue_tail(&priv->offload, skb);

}



static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)

drivers/net/can/rx-offload.c

+3 −2
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload, 
}

EXPORT_SYMBOL_GPL(can_rx_offload_get_echo_skb);



int can_rx_offload_irq_queue_err_skb(struct can_rx_offload *offload, struct sk_buff *skb)

int can_rx_offload_queue_tail(struct can_rx_offload *offload,

			      struct sk_buff *skb)

{

	if (skb_queue_len(&offload->skb_queue) >

	    offload->skb_queue_len_max)
@@ -268,7 +269,7 @@ int can_rx_offload_irq_queue_err_skb(struct can_rx_offload *offload, struct sk_b 


	return 0;

}

EXPORT_SYMBOL_GPL(can_rx_offload_irq_queue_err_skb);

EXPORT_SYMBOL_GPL(can_rx_offload_queue_tail);



static int can_rx_offload_init_queue(struct net_device *dev, struct can_rx_offload *offload, unsigned int weight)

{

include/linux/can/rx-offload.h

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ int can_rx_offload_queue_sorted(struct can_rx_offload *offload, 
				struct sk_buff *skb, u32 timestamp);

unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload,

					 unsigned int idx, u32 timestamp);

int can_rx_offload_irq_queue_err_skb(struct can_rx_offload *offload, struct sk_buff *skb);

int can_rx_offload_queue_tail(struct can_rx_offload *offload,

			      struct sk_buff *skb);

void can_rx_offload_reset(struct can_rx_offload *offload);

void can_rx_offload_del(struct can_rx_offload *offload);

void can_rx_offload_enable(struct can_rx_offload *offload);