Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17dd0ec4 authored by Matthias Schiffer's avatar Matthias Schiffer Committed by David S. Miller
Browse files

net: add netlink_ext_ack argument to rtnl_link_ops.slave_changelink 



Add support for extended error reporting.

Signed-off-by: default avatarMatthias Schiffer <mschiffer@universe-factory.net>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a8b8a889

drivers/net/bonding/bond_netlink.c

+2 −1
Original line number Diff line number Diff line
@@ -132,7 +132,8 @@ static int bond_validate(struct nlattr *tb[], struct nlattr *data[], 


static int bond_slave_changelink(struct net_device *bond_dev,

				 struct net_device *slave_dev,

				 struct nlattr *tb[], struct nlattr *data[])

				 struct nlattr *tb[], struct nlattr *data[],

				 struct netlink_ext_ack *extack)

{

	struct bonding *bond = netdev_priv(bond_dev);

	struct bond_opt_value newval;

include/net/rtnetlink.h

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ struct rtnl_link_ops { 
	int			(*slave_changelink)(struct net_device *dev,

						    struct net_device *slave_dev,

						    struct nlattr *tb[],

						    struct nlattr *data[]);

						    struct nlattr *data[],

						    struct netlink_ext_ack *extack);

	size_t			(*get_slave_size)(const struct net_device *dev,

						  const struct net_device *slave_dev);

	int			(*fill_slave_info)(struct sk_buff *skb,

net/bridge/br_netlink.c

+2 −1
Original line number Diff line number Diff line
@@ -897,7 +897,8 @@ static int br_validate(struct nlattr *tb[], struct nlattr *data[], 
static int br_port_slave_changelink(struct net_device *brdev,

				    struct net_device *dev,

				    struct nlattr *tb[],

				    struct nlattr *data[])

				    struct nlattr *data[],

				    struct netlink_ext_ack *extack)

{

	struct net_bridge *br = netdev_priv(brdev);

	int ret;

net/core/rtnetlink.c

+2 −1
Original line number Diff line number Diff line
@@ -2631,7 +2631,8 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, 
					return -EOPNOTSUPP;



				err = m_ops->slave_changelink(master_dev, dev,

							      tb, slave_data);

							      tb, slave_data,

							      extack);

				if (err < 0)

					return err;

				status |= DO_SETLINK_NOTIFY;