Skip to content

Commit cf7686a

Browse files
pmachatadavem330
authored andcommitted
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: Petr Machata <petrm@mellanox.com> Acked-by: Jiri Pirko <jiri@mellanox.com> Reviewed-by: Ido Schimmel <idosch@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent dc1aea1 commit cf7686a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/net/ipvlan/ipvlan_main.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ static void ipvlan_unregister_nf_hook(struct net *net)
7171
ARRAY_SIZE(ipvl_nfops));
7272
}
7373

74-
static int ipvlan_set_port_mode(struct ipvl_port *port, u16 nval)
74+
static int ipvlan_set_port_mode(struct ipvl_port *port, u16 nval,
75+
struct netlink_ext_ack *extack)
7576
{
7677
struct ipvl_dev *ipvlan;
7778
struct net_device *mdev = port->dev;
@@ -498,7 +499,7 @@ static int ipvlan_nl_changelink(struct net_device *dev,
498499
if (data[IFLA_IPVLAN_MODE]) {
499500
u16 nmode = nla_get_u16(data[IFLA_IPVLAN_MODE]);
500501

501-
err = ipvlan_set_port_mode(port, nmode);
502+
err = ipvlan_set_port_mode(port, nmode, extack);
502503
}
503504

504505
if (!err && data[IFLA_IPVLAN_FLAGS]) {
@@ -672,7 +673,7 @@ int ipvlan_link_new(struct net *src_net, struct net_device *dev,
672673
if (data && data[IFLA_IPVLAN_MODE])
673674
mode = nla_get_u16(data[IFLA_IPVLAN_MODE]);
674675

675-
err = ipvlan_set_port_mode(port, mode);
676+
err = ipvlan_set_port_mode(port, mode, extack);
676677
if (err)
677678
goto unlink_netdev;
678679

0 commit comments

Comments
 (0)