]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
team: use IFF_LIVE_ADDR_CHANGE priv_flag
authorJiri Pirko <jpirko@redhat.com>
Fri, 29 Jun 2012 05:10:07 +0000 (05:10 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 30 Jun 2012 08:08:00 +0000 (01:08 -0700)
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/team/team.c

index 89853c31e7f448b289c1d7e8384c22e5e7dd9fc6..9b94f53a9d4bc313dc63d0690a02c457e4199c70 100644 (file)
@@ -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;