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

Commit c1175547 authored by Markus Elfring's avatar Markus Elfring Committed by David S. Miller
Browse files

net: mvpp2: Rename a jump label in two functions 



Adjust jump labels according to the Linux coding style convention.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8a52488b

drivers/net/ethernet/marvell/mvpp2.c

+7 −9
Original line number Diff line number Diff line
@@ -6065,7 +6065,7 @@ static int mvpp2_set_mac_address(struct net_device *dev, void *p) 


	if (!is_valid_ether_addr(addr->sa_data)) {

		err = -EADDRNOTAVAIL;

		goto error;

		goto log_error;

	}



	if (!netif_running(dev)) {
@@ -6075,7 +6075,7 @@ static int mvpp2_set_mac_address(struct net_device *dev, void *p) 
		/* Reconfigure parser to accept the original MAC address */

		err = mvpp2_prs_update_mac_da(dev, dev->dev_addr);

		if (err)

			goto error;

			goto log_error;

	}



	mvpp2_stop_dev(port);
@@ -6087,14 +6087,13 @@ static int mvpp2_set_mac_address(struct net_device *dev, void *p) 
	/* Reconfigure parser accept the original MAC address */

	err = mvpp2_prs_update_mac_da(dev, dev->dev_addr);

	if (err)

		goto error;

		goto log_error;

out_start:

	mvpp2_start_dev(port);

	mvpp2_egress_enable(port);

	mvpp2_ingress_enable(port);

	return 0;



error:

log_error:

	netdev_err(dev, "fail to change MAC address\n");

	return err;

}
@@ -6120,7 +6119,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu) 
		/* Reconfigure BM to the original MTU */

		err = mvpp2_bm_update_mtu(dev, dev->mtu);

		if (err)

			goto error;

			goto log_error;

	}



	mvpp2_stop_dev(port);
@@ -6134,7 +6133,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu) 
	/* Reconfigure BM to the original MTU */

	err = mvpp2_bm_update_mtu(dev, dev->mtu);

	if (err)

		goto error;

		goto log_error;



out_start:

	mvpp2_start_dev(port);
@@ -6142,8 +6141,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu) 
	mvpp2_ingress_enable(port);



	return 0;



error:

log_error:

	netdev_err(dev, "fail to change MTU\n");

	return err;

}