diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-08 15:41:58 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-08 15:41:58 -0700 |
commit | 636c8a8d85d0564222071f0caa4a4e6bf527efe5 (patch) | |
tree | f1958f80f596cfcf496904f12a62662fa79ce990 /drivers/net/team/team.c | |
parent | 39ec5cbed0bb1878d0b65af0c5e653e37e1945a5 (diff) | |
parent | d48d5691ebf88a15d95ba96486917ffc79256536 (diff) | |
download | linux-636c8a8d85d0564222071f0caa4a4e6bf527efe5.tar.gz |
Merge tag 'usb-serial-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes: USB-serial fixes for v4.6-rc3 Here are some new device ids. Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/net/team/team.c')
-rw-r--r-- | drivers/net/team/team.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 26c64d2782fa..a0f64cba86ba 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1198,6 +1198,9 @@ static int team_port_add(struct team *team, struct net_device *port_dev) goto err_dev_open; } + dev_uc_sync_multiple(port_dev, dev); + dev_mc_sync_multiple(port_dev, dev); + err = vlan_vids_add_by_dev(port_dev, dev); if (err) { netdev_err(dev, "Failed to add vlan ids to device %s\n", @@ -1261,6 +1264,8 @@ err_enable_netpoll: vlan_vids_del_by_dev(port_dev, dev); err_vids_add: + dev_uc_unsync(port_dev, dev); + dev_mc_unsync(port_dev, dev); dev_close(port_dev); err_dev_open: |