mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
can: rx-offload: rename can_rx_offload_irq_queue_err_skb() to can_rx_offload_queue_tail()
commit 4530ec36bb
upstream.
This function has nothing todo with error.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
bb8813be5c
commit
30b996ac6e
3 changed files with 7 additions and 5 deletions
|
@ -599,7 +599,7 @@ static void flexcan_irq_bus_err(struct net_device *dev, u32 reg_esr)
|
||||||
if (tx_errors)
|
if (tx_errors)
|
||||||
dev->stats.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)
|
static void flexcan_irq_state(struct net_device *dev, u32 reg_esr)
|
||||||
|
@ -639,7 +639,7 @@ static void flexcan_irq_state(struct net_device *dev, u32 reg_esr)
|
||||||
if (unlikely(new_state == CAN_STATE_BUS_OFF))
|
if (unlikely(new_state == CAN_STATE_BUS_OFF))
|
||||||
can_bus_off(dev);
|
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)
|
static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)
|
||||||
|
|
|
@ -255,7 +255,8 @@ unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload,
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(can_rx_offload_get_echo_skb);
|
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) >
|
if (skb_queue_len(&offload->skb_queue) >
|
||||||
offload->skb_queue_len_max)
|
offload->skb_queue_len_max)
|
||||||
|
@ -266,7 +267,7 @@ int can_rx_offload_irq_queue_err_skb(struct can_rx_offload *offload, struct sk_b
|
||||||
|
|
||||||
return 0;
|
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)
|
static int can_rx_offload_init_queue(struct net_device *dev, struct can_rx_offload *offload, unsigned int weight)
|
||||||
{
|
{
|
||||||
|
|
|
@ -45,7 +45,8 @@ int can_rx_offload_queue_sorted(struct can_rx_offload *offload,
|
||||||
struct sk_buff *skb, u32 timestamp);
|
struct sk_buff *skb, u32 timestamp);
|
||||||
unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload,
|
unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload,
|
||||||
unsigned int idx, u32 timestamp);
|
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_reset(struct can_rx_offload *offload);
|
||||||
void can_rx_offload_del(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);
|
void can_rx_offload_enable(struct can_rx_offload *offload);
|
||||||
|
|
Loading…
Reference in a new issue