aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/team
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/team')
-rw-r--r--drivers/net/team/team.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 78c7d8724614..2ea4f0ec54b0 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1500,7 +1500,6 @@ static int team_set_mac_address(struct net_device *dev, void *p)
1500 if (dev->type == ARPHRD_ETHER && !is_valid_ether_addr(addr->sa_data)) 1500 if (dev->type == ARPHRD_ETHER && !is_valid_ether_addr(addr->sa_data))
1501 return -EADDRNOTAVAIL; 1501 return -EADDRNOTAVAIL;
1502 memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); 1502 memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
1503 dev->addr_assign_type &= ~NET_ADDR_RANDOM;
1504 rcu_read_lock(); 1503 rcu_read_lock();
1505 list_for_each_entry_rcu(port, &team->port_list, list) 1504 list_for_each_entry_rcu(port, &team->port_list, list)
1506 if (team->ops.port_change_dev_addr) 1505 if (team->ops.port_change_dev_addr)
@@ -1770,7 +1769,6 @@ static void team_setup_by_port(struct net_device *dev,
1770 dev->mtu = port_dev->mtu; 1769 dev->mtu = port_dev->mtu;
1771 memcpy(dev->broadcast, port_dev->broadcast, port_dev->addr_len); 1770 memcpy(dev->broadcast, port_dev->broadcast, port_dev->addr_len);
1772 memcpy(dev->dev_addr, port_dev->dev_addr, port_dev->addr_len); 1771 memcpy(dev->dev_addr, port_dev->dev_addr, port_dev->addr_len);
1773 dev->addr_assign_type &= ~NET_ADDR_RANDOM;
1774} 1772}
1775 1773
1776static int team_dev_type_check_change(struct net_device *dev, 1774static int team_dev_type_check_change(struct net_device *dev,