diff options
| author | David Ahern | 2017-10-05 02:48:46 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-10-05 06:39:33 +0200 |
| commit | 33eaf2a6eb48ebf00374aaaf4b1b43f9950dcbe4 (patch) | |
| tree | 454a262863d22c076b0a7f494152ec16154bd22a /drivers/net/bonding/bond_main.c | |
| parent | net: Add extack to netdev_notifier_info (diff) | |
| download | kernel-qcow2-linux-33eaf2a6eb48ebf00374aaaf4b1b43f9950dcbe4.tar.gz kernel-qcow2-linux-33eaf2a6eb48ebf00374aaaf4b1b43f9950dcbe4.tar.xz kernel-qcow2-linux-33eaf2a6eb48ebf00374aaaf4b1b43f9950dcbe4.zip | |
net: Add extack to ndo_add_slave
Pass extack to do_set_master and down to ndo_add_slave
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index b19dc033fb36..78feb94a36db 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1328,7 +1328,8 @@ void bond_lower_state_changed(struct slave *slave) } /* enslave device <slave> to bond device <master> */ -int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) +int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, + struct netlink_ext_ack *extack) { struct bonding *bond = netdev_priv(bond_dev); const struct net_device_ops *slave_ops = slave_dev->netdev_ops; @@ -3492,7 +3493,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd switch (cmd) { case BOND_ENSLAVE_OLD: case SIOCBONDENSLAVE: - res = bond_enslave(bond_dev, slave_dev); + res = bond_enslave(bond_dev, slave_dev, NULL); break; case BOND_RELEASE_OLD: case SIOCBONDRELEASE: |