diff options
author | David Ahern <dsahern@gmail.com> | 2017-10-04 20:48:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-10-05 00:39:33 -0400 |
commit | 42ab19ee90292993370a30ad242599d75a3b749e (patch) | |
tree | a71275e4ba689a40d20d352a286fc2672228fec0 /drivers/net/macvlan.c | |
parent | 33eaf2a6eb48ebf00374aaaf4b1b43f9950dcbe4 (diff) |
net: Add extack to upper device linking
Add extack arg to netdev_upper_dev_link and netdev_master_upper_dev_link
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
-rw-r--r-- | drivers/net/macvlan.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 1ffe77e95d46..858bd66511a2 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c | |||
@@ -1344,7 +1344,8 @@ static int macvlan_changelink_sources(struct macvlan_dev *vlan, u32 mode, | |||
1344 | } | 1344 | } |
1345 | 1345 | ||
1346 | int macvlan_common_newlink(struct net *src_net, struct net_device *dev, | 1346 | int macvlan_common_newlink(struct net *src_net, struct net_device *dev, |
1347 | struct nlattr *tb[], struct nlattr *data[]) | 1347 | struct nlattr *tb[], struct nlattr *data[], |
1348 | struct netlink_ext_ack *extack) | ||
1348 | { | 1349 | { |
1349 | struct macvlan_dev *vlan = netdev_priv(dev); | 1350 | struct macvlan_dev *vlan = netdev_priv(dev); |
1350 | struct macvlan_port *port; | 1351 | struct macvlan_port *port; |
@@ -1433,7 +1434,7 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev, | |||
1433 | goto destroy_macvlan_port; | 1434 | goto destroy_macvlan_port; |
1434 | 1435 | ||
1435 | dev->priv_flags |= IFF_MACVLAN; | 1436 | dev->priv_flags |= IFF_MACVLAN; |
1436 | err = netdev_upper_dev_link(lowerdev, dev); | 1437 | err = netdev_upper_dev_link(lowerdev, dev, extack); |
1437 | if (err) | 1438 | if (err) |
1438 | goto unregister_netdev; | 1439 | goto unregister_netdev; |
1439 | 1440 | ||
@@ -1456,7 +1457,7 @@ static int macvlan_newlink(struct net *src_net, struct net_device *dev, | |||
1456 | struct nlattr *tb[], struct nlattr *data[], | 1457 | struct nlattr *tb[], struct nlattr *data[], |
1457 | struct netlink_ext_ack *extack) | 1458 | struct netlink_ext_ack *extack) |
1458 | { | 1459 | { |
1459 | return macvlan_common_newlink(src_net, dev, tb, data); | 1460 | return macvlan_common_newlink(src_net, dev, tb, data, extack); |
1460 | } | 1461 | } |
1461 | 1462 | ||
1462 | void macvlan_dellink(struct net_device *dev, struct list_head *head) | 1463 | void macvlan_dellink(struct net_device *dev, struct list_head *head) |