net: vrf: cycle_netdev(): Add an extack argument (dc1aea1e) · Commits · 戴 / test

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>

drivers/net/vrf.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -747,7 +747,8 @@ static int vrf_rtable_create(struct net_device *dev)
		/************************** device handling ******************/

		/* 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;
		int ret;
		@@ -785,7 +786,7 @@ static int do_vrf_add_slave(struct net_device dev, struct net_device port_dev,
		if (ret < 0)
		goto err;

		cycle_netdev(port_dev);
		cycle_netdev(port_dev, extack);

		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);
		port_dev->priv_flags &= ~IFF_L3MDEV_SLAVE;

		cycle_netdev(port_dev);
		cycle_netdev(port_dev, NULL);

		return 0;
		}

Admin message