p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: add netlink_ext_ack argument to rtnl_link_ops.slave_changelink 

Add support for extended error reporting.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Acked-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Matthias Schiffer 2017-06-25 23:56:02 +02:00 committed by David S. Miller
parent a8b8a889e3
commit 17dd0ec470
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/bonding/bond_netlink.c
View File

@ -132,7 +132,8 @@ static int bond_validate(struct nlattr *tb[], struct nlattr *data[],
static int bond_slave_changelink(struct net_device *bond_dev, static int bond_slave_changelink(struct net_device *bond_dev,
struct net_device *slave_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 bonding *bond = netdev_priv(bond_dev);
struct bond_opt_value newval; struct bond_opt_value newval;

3
include/net/rtnetlink.h
View File

@ -95,7 +95,8 @@ struct rtnl_link_ops {
int (*slave_changelink)(struct net_device *dev, int (*slave_changelink)(struct net_device *dev,
struct net_device *slave_dev, struct net_device *slave_dev,
struct nlattr *tb[], struct nlattr *tb[],
struct nlattr *data[]); struct nlattr *data[],
struct netlink_ext_ack *extack);
size_t (*get_slave_size)(const struct net_device *dev, size_t (*get_slave_size)(const struct net_device *dev,
const struct net_device *slave_dev); const struct net_device *slave_dev);
int (*fill_slave_info)(struct sk_buff *skb, int (*fill_slave_info)(struct sk_buff *skb,

3
net/bridge/br_netlink.c
View File

@ -897,7 +897,8 @@ static int br_validate(struct nlattr *tb[], struct nlattr *data[],
static int br_port_slave_changelink(struct net_device *brdev, static int br_port_slave_changelink(struct net_device *brdev,
struct net_device *dev, struct net_device *dev,
struct nlattr *tb[], struct nlattr *tb[],
struct nlattr *data[]) struct nlattr *data[],
struct netlink_ext_ack *extack)
{ {
struct net_bridge *br = netdev_priv(brdev); struct net_bridge *br = netdev_priv(brdev);
int ret; int ret;

3
net/core/rtnetlink.c
View File

@ -2631,7 +2631,8 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
return -EOPNOTSUPP; return -EOPNOTSUPP;
err = m_ops->slave_changelink(master_dev, dev, err = m_ops->slave_changelink(master_dev, dev,
tb, slave_data); tb, slave_data,
extack);
if (err < 0) if (err < 0)
return err; return err;
status |= DO_SETLINK_NOTIFY; status |= DO_SETLINK_NOTIFY;