Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48794a82 authored by Markus Elfring's avatar Markus Elfring Committed by Marc Kleine-Budde
Browse files

can: vxcan: Use common error handling code in vxcan_newlink() 



Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Acked-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent aa4f3c66

drivers/net/can/vxcan.c

+8 −8
Original line number Diff line number Diff line
@@ -227,10 +227,8 @@ static int vxcan_newlink(struct net *net, struct net_device *dev, 
	netif_carrier_off(peer);



	err = rtnl_configure_link(peer, ifmp);

	if (err < 0) {

		unregister_netdevice(peer);

		return err;

	}

	if (err < 0)

		goto unregister_network_device;



	/* register first device */

	if (tb[IFLA_IFNAME])
@@ -239,10 +237,8 @@ static int vxcan_newlink(struct net *net, struct net_device *dev, 
		snprintf(dev->name, IFNAMSIZ, DRV_NAME "%%d");



	err = register_netdevice(dev);

	if (err < 0) {

		unregister_netdevice(peer);

		return err;

	}

	if (err < 0)

		goto unregister_network_device;



	netif_carrier_off(dev);
@@ -254,6 +250,10 @@ static int vxcan_newlink(struct net *net, struct net_device *dev, 
	rcu_assign_pointer(priv->peer, dev);



	return 0;



unregister_network_device:

	unregister_netdevice(peer);

	return err;

}



static void vxcan_dellink(struct net_device *dev, struct list_head *head)