diff options
| author |   Oleksij Rempel <o.rempel@pengutronix.de> | 2018-09-18 11:40:39 +0200 |
|---|---|---|
| committer |   Marc Kleine-Budde <mkl@pengutronix.de> | 2018-11-09 17:33:32 +0100 |
| commit | ed72bc8bcb9277061e753faf300b20f97323761c (patch) | |
| tree | 6442973934e41d4cea8c4b03820c6890aa9e71d6 /drivers/net/can/flexcan.c | |
| parent | can: rx-offload: introduce can_rx_offload_get_echo_skb() and can_rx_offload_queue_sorted() functions (diff) | |
| download | linux-dev-ed72bc8bcb9277061e753faf300b20f97323761c.tar.xz linux-dev-ed72bc8bcb9277061e753faf300b20f97323761c.zip | |
can: flexcan: handle tx-complete CAN frames via rx-offload infrastructure
Current flexcan driver will put TX-ECHO in regular unsorted way, in
this case TX-ECHO can come after the response to the same TXed message.
In some cases, for example for J1939 stack, things will break.
This patch is using new rx-offload API to put the messages just in the
right place.
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>
Diffstat (limited to 'drivers/net/can/flexcan.c')
| -rw-r--r-- | drivers/net/can/flexcan.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 68b46395c580..41a175f80c4b 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -787,8 +787,11 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id) /* transmission complete interrupt */ if (reg_iflag2 & FLEXCAN_IFLAG_MB(FLEXCAN_TX_MB)) { + u32 reg_ctrl = priv->read(®s->mb[FLEXCAN_TX_MB].can_ctrl); + handled = IRQ_HANDLED; - stats->tx_bytes += can_get_echo_skb(dev, 0); + stats->tx_bytes += can_rx_offload_get_echo_skb(&priv->offload, + 0, reg_ctrl << 16); stats->tx_packets++; can_led_event(dev, CAN_LED_EVENT_TX); |