hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: vrf: cycle_netdev(): Add an extack argument 

A follow-up patch will extend dev_change_flags() with an extack
argument. Extend cycle_netdev() to have that argument available for the
conversion.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Petr Machata 2018-12-06 17:05:38 +00:00 committed by David S. Miller
parent 00f54e6892
commit dc1aea1e08
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/vrf.c
View File

@ -747,7 +747,8 @@ static int vrf_rtable_create(struct net_device *dev)
/**************************** device handling ********************/ /**************************** device handling ********************/
/* cycle interface to flush neighbor cache and move routes across tables */ /* cycle interface to flush neighbor cache and move routes across tables */
static void cycle_netdev(struct net_device *dev) static void cycle_netdev(struct net_device *dev,
struct netlink_ext_ack *extack)
{ {
unsigned int flags = dev->flags; unsigned int flags = dev->flags;
int ret; int ret;
@ -785,7 +786,7 @@ static int do_vrf_add_slave(struct net_device *dev, struct net_device *port_dev,
if (ret < 0) if (ret < 0)
goto err; goto err;
cycle_netdev(port_dev); cycle_netdev(port_dev, extack);
return 0; return 0;
@ -815,7 +816,7 @@ static int do_vrf_del_slave(struct net_device *dev, struct net_device *port_dev)
netdev_upper_dev_unlink(port_dev, dev); netdev_upper_dev_unlink(port_dev, dev);
port_dev->priv_flags &= ~IFF_L3MDEV_SLAVE; port_dev->priv_flags &= ~IFF_L3MDEV_SLAVE;
cycle_netdev(port_dev); cycle_netdev(port_dev, NULL);
return 0; return 0;
} }