diff options
author | Thomas Graf <tgraf@suug.ch> | 2013-03-21 03:45:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-22 10:31:16 -0400 |
commit | 661d2967b3f1b34eeaa7e212e7b9bbe8ee072b59 (patch) | |
tree | 66090f1be05a40962838114d66cb085875f58c8a /net/ipv4 | |
parent | 58d7d8f9b20ee6f883532b952f246e4289fe06eb (diff) |
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: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/devinet.c | 7 | ||||
-rw-r--r-- | net/ipv4/fib_frontend.c | 4 | ||||
-rw-r--r-- | net/ipv4/route.c | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index af57bbae05b9..20a9f9274f3f 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c | |||
@@ -536,7 +536,7 @@ struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix, | |||
536 | return NULL; | 536 | return NULL; |
537 | } | 537 | } |
538 | 538 | ||
539 | static int inet_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) | 539 | static int inet_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh) |
540 | { | 540 | { |
541 | struct net *net = sock_net(skb->sk); | 541 | struct net *net = sock_net(skb->sk); |
542 | struct nlattr *tb[IFA_MAX+1]; | 542 | struct nlattr *tb[IFA_MAX+1]; |
@@ -775,7 +775,7 @@ static struct in_ifaddr *find_matching_ifa(struct in_ifaddr *ifa) | |||
775 | return NULL; | 775 | return NULL; |
776 | } | 776 | } |
777 | 777 | ||
778 | static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) | 778 | static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh) |
779 | { | 779 | { |
780 | struct net *net = sock_net(skb->sk); | 780 | struct net *net = sock_net(skb->sk); |
781 | struct in_ifaddr *ifa; | 781 | struct in_ifaddr *ifa; |
@@ -1730,8 +1730,7 @@ static const struct nla_policy devconf_ipv4_policy[NETCONFA_MAX+1] = { | |||
1730 | }; | 1730 | }; |
1731 | 1731 | ||
1732 | static int inet_netconf_get_devconf(struct sk_buff *in_skb, | 1732 | static int inet_netconf_get_devconf(struct sk_buff *in_skb, |
1733 | struct nlmsghdr *nlh, | 1733 | struct nlmsghdr *nlh) |
1734 | void *arg) | ||
1735 | { | 1734 | { |
1736 | struct net *net = sock_net(in_skb->sk); | 1735 | struct net *net = sock_net(in_skb->sk); |
1737 | struct nlattr *tb[NETCONFA_MAX+1]; | 1736 | struct nlattr *tb[NETCONFA_MAX+1]; |
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index eb4bb12b3eb4..0e74398bc8e6 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
@@ -604,7 +604,7 @@ errout: | |||
604 | return err; | 604 | return err; |
605 | } | 605 | } |
606 | 606 | ||
607 | static int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) | 607 | static int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh) |
608 | { | 608 | { |
609 | struct net *net = sock_net(skb->sk); | 609 | struct net *net = sock_net(skb->sk); |
610 | struct fib_config cfg; | 610 | struct fib_config cfg; |
@@ -626,7 +626,7 @@ errout: | |||
626 | return err; | 626 | return err; |
627 | } | 627 | } |
628 | 628 | ||
629 | static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) | 629 | static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh) |
630 | { | 630 | { |
631 | struct net *net = sock_net(skb->sk); | 631 | struct net *net = sock_net(skb->sk); |
632 | struct fib_config cfg; | 632 | struct fib_config cfg; |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 6e2851464f8f..550781a17b34 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -2311,7 +2311,7 @@ nla_put_failure: | |||
2311 | return -EMSGSIZE; | 2311 | return -EMSGSIZE; |
2312 | } | 2312 | } |
2313 | 2313 | ||
2314 | static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void *arg) | 2314 | static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh) |
2315 | { | 2315 | { |
2316 | struct net *net = sock_net(in_skb->sk); | 2316 | struct net *net = sock_net(in_skb->sk); |
2317 | struct rtmsg *rtm; | 2317 | struct rtmsg *rtm; |