Commit cf7686a0 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

net: ipvlan: ipvlan_set_port_mode(): Add an extack argument 



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

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc1aea1e

drivers/net/ipvlan/ipvlan_main.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -71,7 +71,8 @@ static void ipvlan_unregister_nf_hook(struct net *net) 
					ARRAY_SIZE(ipvl_nfops));

					ARRAY_SIZE(ipvl_nfops));

}

}





static int ipvlan_set_port_mode(struct ipvl_port *port, u16 nval)

static int ipvlan_set_port_mode(struct ipvl_port *port, u16 nval,

				struct netlink_ext_ack *extack)

{

{

	struct ipvl_dev *ipvlan;

	struct ipvl_dev *ipvlan;

	struct net_device *mdev = port->dev;

	struct net_device *mdev = port->dev;
@@ -498,7 +499,7 @@ static int ipvlan_nl_changelink(struct net_device *dev, 
	if (data[IFLA_IPVLAN_MODE]) {

	if (data[IFLA_IPVLAN_MODE]) {

		u16 nmode = nla_get_u16(data[IFLA_IPVLAN_MODE]);

		u16 nmode = nla_get_u16(data[IFLA_IPVLAN_MODE]);





		err = ipvlan_set_port_mode(port, nmode);

		err = ipvlan_set_port_mode(port, nmode, extack);

	}

	}





	if (!err && data[IFLA_IPVLAN_FLAGS]) {

	if (!err && data[IFLA_IPVLAN_FLAGS]) {
@@ -672,7 +673,7 @@ int ipvlan_link_new(struct net *src_net, struct net_device *dev, 
	if (data && data[IFLA_IPVLAN_MODE])

	if (data && data[IFLA_IPVLAN_MODE])

		mode = nla_get_u16(data[IFLA_IPVLAN_MODE]);

		mode = nla_get_u16(data[IFLA_IPVLAN_MODE]);





	err = ipvlan_set_port_mode(port, mode);

	err = ipvlan_set_port_mode(port, mode, extack);

	if (err)

	if (err)

		goto unlink_netdev;

		goto unlink_netdev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE