aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/team
diff options
context:
space:
mode:
authorDanny Kukawka <danny.kukawka@bisect.de>2012-02-15 01:45:40 -0500
committerDavid S. Miller <davem@davemloft.net>2012-02-15 15:34:17 -0500
commit7ce5d222190cb3ce3ae88bafde7c4fa52a5103e0 (patch)
tree2b284365b7a2e11d4ba286a589bd35bc39918805 /drivers/net/team
parentf2cedb63df14342ad40a8b5b324fc5d94a60b665 (diff)
net: use eth_hw_addr_random() and reset addr_assign_type
Use eth_hw_addr_random() instead of calling random_ether_addr() to set addr_assign_type correctly to NET_ADDR_RANDOM. Reset the state to NET_ADDR_PERM as soon as the MAC get changed via .ndo_set_mac_address. v2: adapt to renamed eth_hw_addr_random() Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/team')
-rw-r--r--drivers/net/team/team.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 6b678f38e5c..8f81805c682 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -868,6 +868,7 @@ static int team_set_mac_address(struct net_device *dev, void *p)
868 struct team_port *port; 868 struct team_port *port;
869 struct sockaddr *addr = p; 869 struct sockaddr *addr = p;
870 870
871 dev->addr_assign_type &= ~NET_ADDR_RANDOM;
871 memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); 872 memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
872 rcu_read_lock(); 873 rcu_read_lock();
873 list_for_each_entry_rcu(port, &team->port_list, list) 874 list_for_each_entry_rcu(port, &team->port_list, list)
@@ -1087,7 +1088,7 @@ static int team_newlink(struct net *src_net, struct net_device *dev,
1087 int err; 1088 int err;
1088 1089
1089 if (tb[IFLA_ADDRESS] == NULL) 1090 if (tb[IFLA_ADDRESS] == NULL)
1090 random_ether_addr(dev->dev_addr); 1091 eth_hw_addr_random(dev);
1091 1092
1092 err = register_netdevice(dev); 1093 err = register_netdevice(dev);
1093 if (err) 1094 if (err)