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

Commit 661d2967 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

rtnetlink: Remove passing of attributes into rtnl_doit functions 



With decnet converted, we can finally get rid of rta_buf and its
computations around it. It also gets rid of the minimal header
length verification since all message handlers do that explicitly
anyway.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 58d7d8f9

include/net/rtnetlink.h

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

#include <net/netlink.h>



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

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

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

+2 −2
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ 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, void *arg)

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

{

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

	struct br_mdb_entry *entry;
@@ -458,7 +458,7 @@ 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, void *arg)

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

{

	struct net_device *dev;

	struct br_mdb_entry *entry;

net/can/gw.c

+2 −3
Original line number Diff line number Diff line
@@ -778,8 +778,7 @@ 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,

			  void *arg)

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

{

	struct rtcanmsg *r;

	struct cgw_job *gwj;
@@ -868,7 +867,7 @@ static void cgw_remove_all_jobs(void) 
	}

}



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

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

{

	struct cgw_job *gwj = NULL;

	struct hlist_node *nx;

net/core/fib_rules.c

+2 −2
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static int validate_rulemsg(struct fib_rule_hdr *frh, struct nlattr **tb, 
	return err;

}



static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)

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

{

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

	struct fib_rule_hdr *frh = nlmsg_data(nlh);
@@ -415,7 +415,7 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) 
	return err;

}



static int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)

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

{

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

	struct fib_rule_hdr *frh = nlmsg_data(nlh);

net/core/neighbour.c

+3 −3
Original line number Diff line number Diff line
@@ -1613,7 +1613,7 @@ int neigh_table_clear(struct neigh_table *tbl) 
}

EXPORT_SYMBOL(neigh_table_clear);



static int neigh_delete(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)

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

{

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

	struct ndmsg *ndm;
@@ -1677,7 +1677,7 @@ static int neigh_delete(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) 
	return err;

}



static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)

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

{

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

	struct ndmsg *ndm;
@@ -1955,7 +1955,7 @@ static const struct nla_policy nl_ntbl_parm_policy[NDTPA_MAX+1] = { 
	[NDTPA_LOCKTIME]		= { .type = NLA_U64 },

};



static int neightbl_set(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)

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

{

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

	struct neigh_table *tbl;