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/team/team.c | |
| parent | 6621dd29eb9b5e6774ec7a9a75161352fdea47fc (diff) | |
| parent | e58376e1df2aaffbf12753959142a50f824c46ea (diff) | |
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/team/team.c')
| -rw-r--r-- | drivers/net/team/team.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index ae53e899259f..a468439969df 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1112,7 +1112,7 @@ static int team_upper_dev_link(struct team *team, struct team_port *port) lag_upper_info.tx_type = team->mode->lag_tx_type; err = netdev_master_upper_dev_link(port->dev, team->dev, NULL, - &lag_upper_info); + &lag_upper_info, NULL); if (err) return err; port->dev->priv_flags |= IFF_TEAM_PORT; @@ -1914,7 +1914,8 @@ static int team_netpoll_setup(struct net_device *dev, } #endif -static int team_add_slave(struct net_device *dev, struct net_device *port_dev) +static int team_add_slave(struct net_device *dev, struct net_device *port_dev, + struct netlink_ext_ack *extack) { struct team *team = netdev_priv(dev); int err; |