diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2023-07-04 11:23:37 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2023-07-28 08:52:03 +0200 |
| commit | 6c8bc15f02b85bc8f47074110d8fd8caf7a1e42d (patch) | |
| tree | ceccbf4a376168c8e3bccdddb4e42241ad29444a /drivers/net/can | |
| parent | 55ad95d944251bb53df958e408964be2499603fd (diff) | |
| download | linux-stable-6c8bc15f02b85bc8f47074110d8fd8caf7a1e42d.tar.gz linux-stable-6c8bc15f02b85bc8f47074110d8fd8caf7a1e42d.tar.bz2 linux-stable-6c8bc15f02b85bc8f47074110d8fd8caf7a1e42d.zip | |
can: gs_usb: gs_usb_receive_bulk_callback(): count RX overflow errors also in case of OOM
In case of an RX overflow error from the CAN controller and an OOM
where no skb can be allocated, the error counters are not incremented.
Fix this by first incrementing the error counters and then allocate
the skb.
Fixes: d08e973a77d1 ("can: gs_usb: Added support for the GS_USB CAN devices")
Link: https://lore.kernel.org/all/20230718-gs_usb-cleanups-v1-7-c3b9154ec605@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/usb/gs_usb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c index 0d0a3405ba19..e302d7d568aa 100644 --- a/drivers/net/can/usb/gs_usb.c +++ b/drivers/net/can/usb/gs_usb.c @@ -631,6 +631,9 @@ static void gs_usb_receive_bulk_callback(struct urb *urb) } if (hf->flags & GS_CAN_FLAG_OVERFLOW) { + stats->rx_over_errors++; + stats->rx_errors++; + skb = alloc_can_err_skb(netdev, &cf); if (!skb) goto resubmit_urb; @@ -638,8 +641,6 @@ static void gs_usb_receive_bulk_callback(struct urb *urb) cf->can_id |= CAN_ERR_CRTL; cf->len = CAN_ERR_DLC; cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW; - stats->rx_over_errors++; - stats->rx_errors++; netif_rx(skb); } |