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

Commit c21ef3e3 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: rtnetlink: plumb extended ack to doit function 



Add netlink_ext_ack arg to rtnl_doit_func. Pass extack arg to nlmsg_parse
for doit functions that call it directly.

This is the first step to using extended error reporting in rtnetlink.
>From here individual subsystems can be updated to set netlink_ext_ack as
needed.

Signed-off-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent af3b5158

drivers/net/vrf.c

+2 −2
Original line number Diff line number Diff line
@@ -1282,11 +1282,11 @@ static int vrf_fib_rule(const struct net_device *dev, __u8 family, bool add_it) 
	/* fib_nl_{new,del}rule handling looks for net from skb->sk */

	skb->sk = dev_net(dev)->rtnl;

	if (add_it) {

		err = fib_nl_newrule(skb, nlh);

		err = fib_nl_newrule(skb, nlh, NULL);

		if (err == -EEXIST)

			err = 0;

	} else {

		err = fib_nl_delrule(skb, nlh);

		err = fib_nl_delrule(skb, nlh, NULL);

		if (err == -ENOENT)

			err = 0;

	}

include/net/fib_rules.h

+4 −2
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ int fib_default_rule_add(struct fib_rules_ops *, u32 pref, u32 table, 
			 u32 flags);

bool fib_rule_matchall(const struct fib_rule *rule);



int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh);

int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh);

int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh,

		   struct netlink_ext_ack *extack);

int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh,

		   struct netlink_ext_ack *extack);

#endif

include/net/rtnetlink.h

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ 
#include <linux/rtnetlink.h>

#include <net/netlink.h>



typedef int (*rtnl_doit_func)(struct sk_buff *, struct nlmsghdr *);

typedef int (*rtnl_doit_func)(struct sk_buff *, struct nlmsghdr *,

			      struct netlink_ext_ack *);

typedef int (*rtnl_dumpit_func)(struct sk_buff *, struct netlink_callback *);

typedef u16 (*rtnl_calcit_func)(struct sk_buff *, struct nlmsghdr *);

net/bridge/br_mdb.c

+4 −2
Original line number Diff line number Diff line
@@ -569,7 +569,8 @@ static int __br_mdb_add(struct net *net, struct net_bridge *br, 
	return ret;

}



static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh)

static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,

		      struct netlink_ext_ack *extack)

{

	struct net *net = sock_net(skb->sk);

	struct net_bridge_vlan_group *vg;
@@ -663,7 +664,8 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry) 
	return err;

}



static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh)

static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,

		      struct netlink_ext_ack *extack)

{

	struct net *net = sock_net(skb->sk);

	struct net_bridge_vlan_group *vg;

net/can/gw.c

+4 −2
Original line number Diff line number Diff line
@@ -809,7 +809,8 @@ static int cgw_parse_attr(struct nlmsghdr *nlh, struct cf_mod *mod, 
	return 0;

}



static int cgw_create_job(struct sk_buff *skb,  struct nlmsghdr *nlh)

static int cgw_create_job(struct sk_buff *skb,  struct nlmsghdr *nlh,

			  struct netlink_ext_ack *extack)

{

	struct rtcanmsg *r;

	struct cgw_job *gwj;
@@ -921,7 +922,8 @@ static void cgw_remove_all_jobs(void) 
	}

}



static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)

static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh,

			  struct netlink_ext_ack *extack)

{

	struct cgw_job *gwj = NULL;

	struct hlist_node *nx;