Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 314936
b: refs/heads/master
c: 5a1d1c8
h: refs/heads/master
v: v3
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Jun 30, 2012
1 parent f012abd commit 49e6e65
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f2f2c8b42d5b1858e1680133fcd4bea5c8dcdb2c
refs/heads/master: 5a1d1c8c78e55df2e876249f8e3a4a573efdbaa6
9 changes: 5 additions & 4 deletions trunk/drivers/net/team/team.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 49e6e65

Please sign in to comment.