提交 c1175547 编写于 作者: M Markus Elfring 提交者: David S. Miller

net: mvpp2: Rename a jump label in two functions

Adjust jump labels according to the Linux coding style convention.
Signed-off-by: NMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 8a52488b
...@@ -6065,7 +6065,7 @@ static int mvpp2_set_mac_address(struct net_device *dev, void *p) ...@@ -6065,7 +6065,7 @@ static int mvpp2_set_mac_address(struct net_device *dev, void *p)
if (!is_valid_ether_addr(addr->sa_data)) { if (!is_valid_ether_addr(addr->sa_data)) {
err = -EADDRNOTAVAIL; err = -EADDRNOTAVAIL;
goto error; goto log_error;
} }
if (!netif_running(dev)) { if (!netif_running(dev)) {
...@@ -6075,7 +6075,7 @@ static int mvpp2_set_mac_address(struct net_device *dev, void *p) ...@@ -6075,7 +6075,7 @@ static int mvpp2_set_mac_address(struct net_device *dev, void *p)
/* Reconfigure parser to accept the original MAC address */ /* Reconfigure parser to accept the original MAC address */
err = mvpp2_prs_update_mac_da(dev, dev->dev_addr); err = mvpp2_prs_update_mac_da(dev, dev->dev_addr);
if (err) if (err)
goto error; goto log_error;
} }
mvpp2_stop_dev(port); mvpp2_stop_dev(port);
...@@ -6087,14 +6087,13 @@ static int mvpp2_set_mac_address(struct net_device *dev, void *p) ...@@ -6087,14 +6087,13 @@ static int mvpp2_set_mac_address(struct net_device *dev, void *p)
/* Reconfigure parser accept the original MAC address */ /* Reconfigure parser accept the original MAC address */
err = mvpp2_prs_update_mac_da(dev, dev->dev_addr); err = mvpp2_prs_update_mac_da(dev, dev->dev_addr);
if (err) if (err)
goto error; goto log_error;
out_start: out_start:
mvpp2_start_dev(port); mvpp2_start_dev(port);
mvpp2_egress_enable(port); mvpp2_egress_enable(port);
mvpp2_ingress_enable(port); mvpp2_ingress_enable(port);
return 0; return 0;
log_error:
error:
netdev_err(dev, "fail to change MAC address\n"); netdev_err(dev, "fail to change MAC address\n");
return err; return err;
} }
...@@ -6120,7 +6119,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu) ...@@ -6120,7 +6119,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu)
/* Reconfigure BM to the original MTU */ /* Reconfigure BM to the original MTU */
err = mvpp2_bm_update_mtu(dev, dev->mtu); err = mvpp2_bm_update_mtu(dev, dev->mtu);
if (err) if (err)
goto error; goto log_error;
} }
mvpp2_stop_dev(port); mvpp2_stop_dev(port);
...@@ -6134,7 +6133,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu) ...@@ -6134,7 +6133,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu)
/* Reconfigure BM to the original MTU */ /* Reconfigure BM to the original MTU */
err = mvpp2_bm_update_mtu(dev, dev->mtu); err = mvpp2_bm_update_mtu(dev, dev->mtu);
if (err) if (err)
goto error; goto log_error;
out_start: out_start:
mvpp2_start_dev(port); mvpp2_start_dev(port);
...@@ -6142,8 +6141,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu) ...@@ -6142,8 +6141,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu)
mvpp2_ingress_enable(port); mvpp2_ingress_enable(port);
return 0; return 0;
log_error:
error:
netdev_err(dev, "fail to change MTU\n"); netdev_err(dev, "fail to change MTU\n");
return err; return err;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册