mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
net: mvpp2: set mac address does not require the stop/start sequence
Remove special stop/start handling from the set_mac_address callback. All this special care is not needed, and can be removed. It also simplifies the up/down status in the driver and helps avoiding possible link status mismatch issues. Signed-off-by: Yan Markman <ymarkman@marvell.com> [Antoine: commit message] Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
914365f1c9
commit
5b0ab2f41d
1 changed files with 7 additions and 31 deletions
|
@ -7357,42 +7357,18 @@ static void mvpp2_set_rx_mode(struct net_device *dev)
|
|||
|
||||
static int mvpp2_set_mac_address(struct net_device *dev, void *p)
|
||||
{
|
||||
struct mvpp2_port *port = netdev_priv(dev);
|
||||
const struct sockaddr *addr = p;
|
||||
int err;
|
||||
|
||||
if (!is_valid_ether_addr(addr->sa_data)) {
|
||||
err = -EADDRNOTAVAIL;
|
||||
goto log_error;
|
||||
}
|
||||
|
||||
if (!netif_running(dev)) {
|
||||
err = mvpp2_prs_update_mac_da(dev, addr->sa_data);
|
||||
if (!err)
|
||||
return 0;
|
||||
/* Reconfigure parser to accept the original MAC address */
|
||||
err = mvpp2_prs_update_mac_da(dev, dev->dev_addr);
|
||||
if (err)
|
||||
goto log_error;
|
||||
}
|
||||
|
||||
mvpp2_stop_dev(port);
|
||||
if (!is_valid_ether_addr(addr->sa_data))
|
||||
return -EADDRNOTAVAIL;
|
||||
|
||||
err = mvpp2_prs_update_mac_da(dev, addr->sa_data);
|
||||
if (!err)
|
||||
goto out_start;
|
||||
|
||||
/* Reconfigure parser accept the original MAC address */
|
||||
err = mvpp2_prs_update_mac_da(dev, dev->dev_addr);
|
||||
if (err)
|
||||
goto log_error;
|
||||
out_start:
|
||||
mvpp2_start_dev(port);
|
||||
mvpp2_egress_enable(port);
|
||||
mvpp2_ingress_enable(port);
|
||||
return 0;
|
||||
log_error:
|
||||
netdev_err(dev, "failed to change MAC address\n");
|
||||
if (err) {
|
||||
/* Reconfigure parser accept the original MAC address */
|
||||
mvpp2_prs_update_mac_da(dev, dev->dev_addr);
|
||||
netdev_err(dev, "failed to change MAC address\n");
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue