aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/team
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-03-12 05:52:22 -0400
committerDavid S. Miller <davem@davemloft.net>2013-03-12 05:52:22 -0400
commite5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf (patch)
tree3558f68717c70a67e18c3274bb17709a353d036f /drivers/net/team
parent30129cf28a5c99f9cb7c168f0d280f147fd6cc8b (diff)
parent3da889b616164bde76a37350cf28e0d17a94e979 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/intel/e1000e/netdev.c Minor conflict in e1000e, a line that got fixed in 'net' has been removed in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/team')
-rw-r--r--drivers/net/team/team.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 6ba0883b9c36..621c1bddeee9 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1151,6 +1151,8 @@ static int team_port_del(struct team *team, struct net_device *port_dev)
1151 netdev_upper_dev_unlink(port_dev, dev); 1151 netdev_upper_dev_unlink(port_dev, dev);
1152 team_port_disable_netpoll(port); 1152 team_port_disable_netpoll(port);
1153 vlan_vids_del_by_dev(port_dev, dev); 1153 vlan_vids_del_by_dev(port_dev, dev);
1154 dev_uc_unsync(port_dev, dev);
1155 dev_mc_unsync(port_dev, dev);
1154 dev_close(port_dev); 1156 dev_close(port_dev);
1155 team_port_leave(team, port); 1157 team_port_leave(team, port);
1156 1158