diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-04 21:39:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-04 21:39:34 -0700 |
| commit | c331501c88b64dd1bf83eddcc040441dec187f7e (patch) | |
| tree | 7336e8a94272855046ff07440fa0e23beba0f73d /drivers/net/hyperv/netvsc_drv.c | |
| parent | dev: advertise the new nsid when the netns iface changes (diff) | |
| parent | mlxsw: spectrum: Add extack messages for enslave failures (diff) | |
| download | linux-c331501c88b64dd1bf83eddcc040441dec187f7e.tar.gz linux-c331501c88b64dd1bf83eddcc040441dec187f7e.zip | |
Merge branch 'enslavement-extack'
David Ahern says:
====================
net: Plumb extack error reporting to enslavements
Another round of extending extack error reporting, this time for
enslavements through ndo_add_slave and notifiers.
v2
- changed how the messages are added to bonding driver per Jiri's request
- fixed spectrum message for LAG overflow per Ido's comment
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv/netvsc_drv.c')
| -rw-r--r-- | drivers/net/hyperv/netvsc_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index f300ae61c6c6..dfb986421ec6 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -1748,7 +1748,7 @@ static int netvsc_vf_join(struct net_device *vf_netdev, goto rx_handler_failed; } - ret = netdev_upper_dev_link(vf_netdev, ndev); + ret = netdev_upper_dev_link(vf_netdev, ndev, NULL); if (ret != 0) { netdev_err(vf_netdev, "can not set master device %s (err = %d)\n", |