can: dev: can_restart(): reverse logic to remove need for goto

[ Upstream commit 8f3ec204d340af183fb2bb21b8e797ac2ed012b2 ]

Reverse the logic in the if statement and eliminate the need for a
goto to simplify code readability.

Link: https://lore.kernel.org/all/20231005-can-dev-fix-can-restart-v2-3-91b5c1fd922c@pengutronix.de
Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Stable-dep-of: c1f3f9797c1f ("can: netlink: can_changelink(): fix NULL pointer deref of struct can_priv::do_set_mode")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/can/dev/dev.c b/drivers/net/can/dev/dev.c
index 7d9a7c92d4cf63c85da768831204ee9aab8ae040..6c1ceb8ce6c4bef4643a7d202462d166e3af9690 100644 (file)
--- a/drivers/net/can/dev/dev.c
+++ b/drivers/net/can/dev/dev.c
@@ -142,14 +142,11 @@ static void can_restart(struct net_device *dev)
 
        /* send restart message upstream */
        skb = alloc_can_err_skb(dev, &cf);
-       if (!skb)
-               goto restart;
-
-       cf->can_id |= CAN_ERR_RESTARTED;
-
-       netif_rx(skb);
+       if (skb) {
+               cf->can_id |= CAN_ERR_RESTARTED;
+               netif_rx(skb);
+       }
 
-restart:
        netdev_dbg(dev, "restarted\n");
        priv->can_stats.restarts++;