diff options
| author |   Jiri Pirko <jpirko@redhat.com> | 2012-06-29 05:10:07 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-06-30 01:08:00 -0700 |
| commit | 5a1d1c8c78e55df2e876249f8e3a4a573efdbaa6 (patch) | |
| tree | 4681728ca0a813ac414fe2be1aedd1be5e98fe04 /drivers/net | |
| parent | virtio_net: use IFF_LIVE_ADDR_CHANGE priv_flag (diff) | |
| download | linux-dev-5a1d1c8c78e55df2e876249f8e3a4a573efdbaa6.tar.xz linux-dev-5a1d1c8c78e55df2e876249f8e3a4a573efdbaa6.zip | |
team: use IFF_LIVE_ADDR_CHANGE priv_flag
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/team/team.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 89853c31e7f4..9b94f53a9d4b 100644 --- a/drivers/net/team/team.c +++ b/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; |