Skip to content

Commit

Permalink
net: add netlink_ext_ack argument to rtnl_link_ops.newlink
Browse files Browse the repository at this point in the history 
Add support for extended error reporting.

Signed-off-by: Matthias Schiffer <[email protected]>
Acked-by: David Ahern <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
@neocturne @davem330
neocturne authored and davem330 committed Jun 27, 2017
1 parent dacdbb4 commit 7a3f4a1
Show file tree
Hide file tree
Showing 32 changed files with 68 additions and 40 deletions.
3 changes: 2 additions & 1 deletion drivers/infiniband/ulp/ipoib/ipoib_netlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ static int ipoib_changelink(struct net_device *dev,
}

static int ipoib_new_child_link(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct net_device *pdev;
struct ipoib_dev_priv *ppriv;
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/bonding/bond_netlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,8 @@ static int bond_changelink(struct net_device *bond_dev,
}

static int bond_newlink(struct net *src_net, struct net_device *bond_dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
int err;

Expand Down
3 changes: 2 additions & 1 deletion drivers/net/caif/caif_hsi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,8 @@ static int caif_hsi_fill_info(struct sk_buff *skb, const struct net_device *dev)
}

static int caif_hsi_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct cfhsi *cfhsi = NULL;
struct cfhsi_ops *(*get_ops)(void);
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/can/dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,8 @@ static int can_fill_xstats(struct sk_buff *skb, const struct net_device *dev)
}

static int can_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
return -EOPNOTSUPP;
}
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/can/vxcan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ static void vxcan_setup(struct net_device *dev)
static struct rtnl_link_ops vxcan_link_ops;

static int vxcan_newlink(struct net *net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct vxcan_priv *priv;
struct net_device *peer;
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/geneve.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,8 @@ static void init_tnl_info(struct ip_tunnel_info *info, __u16 dst_port)
}

static int geneve_newlink(struct net *net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
bool use_udp6_rx_checksums = false;
struct ip_tunnel_info info;
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/gtp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,8 @@ static void gtp_hashtable_free(struct gtp_dev *gtp);
static int gtp_encap_enable(struct gtp_dev *gtp, struct nlattr *data[]);

static int gtp_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct gtp_dev *gtp;
struct gtp_net *gn;
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/ipvlan/ipvlan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ unsigned int ipvlan_nf_input(void *priv, struct sk_buff *skb,
void ipvlan_count_rx(const struct ipvl_dev *ipvlan,
unsigned int len, bool success, bool mcast);
int ipvlan_link_new(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[]);
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack);
void ipvlan_link_delete(struct net_device *dev, struct list_head *head);
void ipvlan_link_setup(struct net_device *dev);
int ipvlan_link_register(struct rtnl_link_ops *ops);
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/ipvlan/ipvlan_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,8 @@ static int ipvlan_nl_fillinfo(struct sk_buff *skb,
}

int ipvlan_link_new(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct ipvl_dev *ipvlan = netdev_priv(dev);
struct ipvl_port *port;
Expand Down
9 changes: 4 additions & 5 deletions drivers/net/ipvlan/ipvtap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,9 @@ static void ipvtap_update_features(struct tap_dev *tap,
netdev_update_features(vlan->dev);
}

static int ipvtap_newlink(struct net *src_net,
struct net_device *dev,
struct nlattr *tb[],
struct nlattr *data[])
static int ipvtap_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct ipvtap_dev *vlantap = netdev_priv(dev);
int err;
Expand All @@ -98,7 +97,7 @@ static int ipvtap_newlink(struct net *src_net,
/* Don't put anything that may fail after macvlan_common_newlink
* because we can't undo what it does.
*/
err = ipvlan_link_new(src_net, dev, tb, data);
err = ipvlan_link_new(src_net, dev, tb, data, extack);
if (err) {
netdev_rx_handler_unregister(dev);
return err;
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/macsec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3203,7 +3203,8 @@ static int macsec_add_dev(struct net_device *dev, sci_t sci, u8 icv_len)
}

static int macsec_newlink(struct net *net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct macsec_dev *macsec = macsec_priv(dev);
struct net_device *real_dev;
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/macvlan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1390,7 +1390,8 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
EXPORT_SYMBOL_GPL(macvlan_common_newlink);

static int macvlan_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
return macvlan_common_newlink(src_net, dev, tb, data);
}
Expand Down
7 changes: 3 additions & 4 deletions drivers/net/macvtap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,9 @@ static void macvtap_update_features(struct tap_dev *tap,
netdev_update_features(vlan->dev);
}

static int macvtap_newlink(struct net *src_net,
struct net_device *dev,
struct nlattr *tb[],
struct nlattr *data[])
static int macvtap_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct macvtap_dev *vlantap = netdev_priv(dev);
int err;
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/ppp/ppp_generic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,8 @@ static int ppp_nl_validate(struct nlattr *tb[], struct nlattr *data[])
}

static int ppp_nl_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct ppp_config conf = {
.unit = -1,
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/team/team.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2101,7 +2101,8 @@ static void team_setup(struct net_device *dev)
}

static int team_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
if (tb[IFLA_ADDRESS] == NULL)
eth_hw_addr_random(dev);
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/veth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,8 @@ static int veth_validate(struct nlattr *tb[], struct nlattr *data[])
static struct rtnl_link_ops veth_link_ops;

static int veth_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
int err;
struct net_device *peer;
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/vrf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1389,7 +1389,8 @@ static void vrf_dellink(struct net_device *dev, struct list_head *head)
}

static int vrf_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct net_vrf *vrf = netdev_priv(dev);
bool *add_fib_rules;
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/vxlan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3333,7 +3333,8 @@ static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],
}

static int vxlan_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct vxlan_config conf;
int err;
Expand Down
3 changes: 2 additions & 1 deletion include/net/rtnetlink.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ struct rtnl_link_ops {
int (*newlink)(struct net *src_net,
struct net_device *dev,
struct nlattr *tb[],
struct nlattr *data[]);
struct nlattr *data[],
struct netlink_ext_ack *extack);
int (*changelink)(struct net_device *dev,
struct nlattr *tb[],
struct nlattr *data[]);
Expand Down
3 changes: 2 additions & 1 deletion net/8021q/vlan_netlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ static int vlan_changelink(struct net_device *dev,
}

static int vlan_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
struct net_device *real_dev;
Expand Down
3 changes: 2 additions & 1 deletion net/bridge/br_netlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1213,7 +1213,8 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
}

static int br_dev_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct net_bridge *br = netdev_priv(dev);
int err;
Expand Down
3 changes: 2 additions & 1 deletion net/caif/chnl_net.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,8 @@ static void caif_netlink_parms(struct nlattr *data[],
}

static int ipcaif_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
int ret;
struct chnl_net *caifdev;
Expand Down
3 changes: 2 additions & 1 deletion net/core/rtnetlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2705,7 +2705,8 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
dev->ifindex = ifm->ifi_index;

if (ops->newlink) {
err = ops->newlink(link_net ? : net, dev, tb, data);
err = ops->newlink(link_net ? : net, dev, tb, data,
extack);
/* Drivers should call free_netdev() in ->destructor
* and unregister it on failure after registration
* so that device could be finally freed in rtnl_unlock.
Expand Down
3 changes: 2 additions & 1 deletion net/hsr/hsr_netlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ static const struct nla_policy hsr_policy[IFLA_HSR_MAX + 1] = {
* hsr_dev_setup routine has been executed. Nice!
*/
static int hsr_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct net_device *link[2];
unsigned char multicast_spec, hsr_version;
Expand Down
3 changes: 2 additions & 1 deletion net/ieee802154/6lowpan/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ static int lowpan_validate(struct nlattr *tb[], struct nlattr *data[])
}

static int lowpan_newlink(struct net *src_net, struct net_device *ldev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct net_device *wdev;
int ret;
Expand Down
5 changes: 3 additions & 2 deletions net/ipv4/ip_gre.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,8 @@ static void ipgre_tap_setup(struct net_device *dev)
}

static int ipgre_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct ip_tunnel_parm p;
struct ip_tunnel_encap ipencap;
Expand Down Expand Up @@ -1155,7 +1156,7 @@ struct net_device *gretap_fb_dev_create(struct net *net, const char *name,
t = netdev_priv(dev);
t->collect_md = true;

err = ipgre_newlink(net, dev, tb, NULL);
err = ipgre_newlink(net, dev, tb, NULL, NULL);
if (err < 0) {
free_netdev(dev);
return ERR_PTR(err);
Expand Down
3 changes: 2 additions & 1 deletion net/ipv4/ip_vti.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,8 @@ static void vti_netlink_parms(struct nlattr *data[],
}

static int vti_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct ip_tunnel_parm parms;
__u32 fwmark = 0;
Expand Down
3 changes: 2 additions & 1 deletion net/ipv4/ipip.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,8 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],
}

static int ipip_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct ip_tunnel *t = netdev_priv(dev);
struct ip_tunnel_parm p;
Expand Down
3 changes: 2 additions & 1 deletion net/ipv6/ip6_gre.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1342,7 +1342,8 @@ static bool ip6gre_netlink_encap_parms(struct nlattr *data[],
}

static int ip6gre_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct ip6_tnl *nt;
struct net *net = dev_net(dev);
Expand Down
3 changes: 2 additions & 1 deletion net/ipv6/ip6_tunnel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1974,7 +1974,8 @@ static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
}

static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct net *net = dev_net(dev);
struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
Expand Down
3 changes: 2 additions & 1 deletion net/ipv6/ip6_vti.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,8 @@ static void vti6_netlink_parms(struct nlattr *data[],
}

static int vti6_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct net *net = dev_net(dev);
struct ip6_tnl *nt;
Expand Down
3 changes: 2 additions & 1 deletion net/ipv6/sit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,8 @@ static bool ipip6_netlink_6rd_parms(struct nlattr *data[],
#endif

static int ipip6_newlink(struct net *src_net, struct net_device *dev,
struct nlattr *tb[], struct nlattr *data[])
struct nlattr *tb[], struct nlattr *data[],
struct netlink_ext_ack *extack)
{
struct net *net = dev_net(dev);
struct ip_tunnel *nt;
Expand Down

0 comments on commit 7a3f4a1

Please sign in to comment.