From 49e6e655947cbf181fb60c9a4de32861e1a89cb2 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Fri, 29 Jun 2012 05:10:07 +0000 Subject: [PATCH] --- yaml --- r: 314936 b: refs/heads/master c: 5a1d1c8c78e55df2e876249f8e3a4a573efdbaa6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/team/team.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5d173c8279f7..e4706c4da0c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2f2c8b42d5b1858e1680133fcd4bea5c8dcdb2c +refs/heads/master: 5a1d1c8c78e55df2e876249f8e3a4a573efdbaa6 diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c index 89853c31e7f4..9b94f53a9d4b 100644 --- a/trunk/drivers/net/team/team.c +++ b/trunk/drivers/net/team/team.c @@ -1188,10 +1188,11 @@ static int team_set_mac_address(struct net_device *dev, void *p) { struct team *team = netdev_priv(dev); struct team_port *port; - struct sockaddr *addr = p; + int err; - dev->addr_assign_type &= ~NET_ADDR_RANDOM; - memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + err = eth_mac_addr(dev, p); + if (err) + return err; rcu_read_lock(); list_for_each_entry_rcu(port, &team->port_list, list) if (team->ops.port_change_mac) @@ -1393,7 +1394,7 @@ static void team_setup(struct net_device *dev) * bring us to promisc mode in case a unicast addr is added. * Let this up to underlay drivers. */ - dev->priv_flags |= IFF_UNICAST_FLT; + dev->priv_flags |= IFF_UNICAST_FLT | IFF_LIVE_ADDR_CHANGE; dev->features |= NETIF_F_LLTX; dev->features |= NETIF_F_GRO;