Skip to content

Commit dc1aea1

Browse files
pmachatadavem330
authored andcommitted
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>
1 parent 00f54e6 commit dc1aea1

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/net/vrf.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,8 @@ static int vrf_rtable_create(struct net_device *dev)
747747
/**************************** device handling ********************/
748748

749749
/* cycle interface to flush neighbor cache and move routes across tables */
750-
static void cycle_netdev(struct net_device *dev)
750+
static void cycle_netdev(struct net_device *dev,
751+
struct netlink_ext_ack *extack)
751752
{
752753
unsigned int flags = dev->flags;
753754
int ret;
@@ -785,7 +786,7 @@ static int do_vrf_add_slave(struct net_device *dev, struct net_device *port_dev,
785786
if (ret < 0)
786787
goto err;
787788

788-
cycle_netdev(port_dev);
789+
cycle_netdev(port_dev, extack);
789790

790791
return 0;
791792

@@ -815,7 +816,7 @@ static int do_vrf_del_slave(struct net_device *dev, struct net_device *port_dev)
815816
netdev_upper_dev_unlink(port_dev, dev);
816817
port_dev->priv_flags &= ~IFF_L3MDEV_SLAVE;
817818

818-
cycle_netdev(port_dev);
819+
cycle_netdev(port_dev, NULL);
819820

820821
return 0;
821822
}

0 commit comments

Comments
 (0)