Skip to content

Commit

Permalink
can: c_can: exit c_can_do_tx() early if no frames have been sent
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dario Binacchi authored and Marc Kleine-Budde committed Aug 19, 2021
1 parent 5064e40 commit a54cdbb
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/net/can/c_can/c_can_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a54cdbb

Please sign in to comment.