summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDario Binacchi <dariobin@libero.it>2021-08-07 16:07:58 +0300
committerMarc Kleine-Budde <mkl@pengutronix.de>2021-08-19 16:07:05 +0300
commita54cdbba9deee77ca48b5eec0c26fcc72538538c (patch)
tree5311731f7a10922d5c7793f7fb375198ae556fe1 /drivers/net
parent5064e40596f478fce241cffbc780d3b156d74066 (diff)
downloadlinux-a54cdbba9deee77ca48b5eec0c26fcc72538538c.tar.xz
can: c_can: exit c_can_do_tx() early if no frames have been sent
The c_can_poll() handles RX/TX events unconditionally. It may therefore happen that c_can_do_tx() is called unnecessarily because the interrupt was triggered by the reception of a frame. In these cases, we avoid to execute unnecessary statements and exit immediately. Link: https://lore.kernel.org/r/20210807130800.5246-3-dariobin@libero.it Signed-off-by: Dario Binacchi <dariobin@libero.it> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/can/c_can/c_can_main.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/can/c_can/c_can_main.c b/drivers/net/can/c_can/c_can_main.c
index 052ff35ed4dc..1ec0ce664732 100644
--- a/drivers/net/can/c_can/c_can_main.c
+++ b/drivers/net/can/c_can/c_can_main.c
@@ -720,17 +720,18 @@ static void c_can_do_tx(struct net_device *dev)
pkts++;
}
+ if (!pkts)
+ return;
+
/* Clear the bits in the tx_active mask */
atomic_sub(clr, &priv->tx_active);
if (clr & BIT(priv->msg_obj_tx_num - 1))
netif_wake_queue(dev);
- if (pkts) {
- stats->tx_bytes += bytes;
- stats->tx_packets += pkts;
- can_led_event(dev, CAN_LED_EVENT_TX);
- }
+ stats->tx_bytes += bytes;
+ stats->tx_packets += pkts;
+ can_led_event(dev, CAN_LED_EVENT_TX);
}
/* If we have a gap in the pending bits, that means we either