diff options
author | Rami Rosen <ramirose@gmail.com> | 2014-07-01 14:17:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-07 23:52:49 -0400 |
commit | 46c9521fc245d91ff5b14cf246f28cee3f99a670 (patch) | |
tree | fdbde705a0f17e071f456d68b01f1f64d0fa4ad2 | |
parent | 8e6e85e606c9472fca7504f231585e7760841628 (diff) |
netlink: Fix do_one_broadcast() prototype.
This patch changes the prototype of the do_one_broadcast() method so that it will return void.
Signed-off-by: Rami Rosen <ramirose@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/netlink/af_netlink.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 15c731f03fa6..e8c9f9704216 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
@@ -1961,25 +1961,25 @@ struct netlink_broadcast_data { | |||
1961 | void *tx_data; | 1961 | void *tx_data; |
1962 | }; | 1962 | }; |
1963 | 1963 | ||
1964 | static int do_one_broadcast(struct sock *sk, | 1964 | static void do_one_broadcast(struct sock *sk, |
1965 | struct netlink_broadcast_data *p) | 1965 | struct netlink_broadcast_data *p) |
1966 | { | 1966 | { |
1967 | struct netlink_sock *nlk = nlk_sk(sk); | 1967 | struct netlink_sock *nlk = nlk_sk(sk); |
1968 | int val; | 1968 | int val; |
1969 | 1969 | ||
1970 | if (p->exclude_sk == sk) | 1970 | if (p->exclude_sk == sk) |
1971 | goto out; | 1971 | return; |
1972 | 1972 | ||
1973 | if (nlk->portid == p->portid || p->group - 1 >= nlk->ngroups || | 1973 | if (nlk->portid == p->portid || p->group - 1 >= nlk->ngroups || |
1974 | !test_bit(p->group - 1, nlk->groups)) | 1974 | !test_bit(p->group - 1, nlk->groups)) |
1975 | goto out; | 1975 | return; |
1976 | 1976 | ||
1977 | if (!net_eq(sock_net(sk), p->net)) | 1977 | if (!net_eq(sock_net(sk), p->net)) |
1978 | goto out; | 1978 | return; |
1979 | 1979 | ||
1980 | if (p->failure) { | 1980 | if (p->failure) { |
1981 | netlink_overrun(sk); | 1981 | netlink_overrun(sk); |
1982 | goto out; | 1982 | return; |
1983 | } | 1983 | } |
1984 | 1984 | ||
1985 | sock_hold(sk); | 1985 | sock_hold(sk); |
@@ -2017,9 +2017,6 @@ static int do_one_broadcast(struct sock *sk, | |||
2017 | p->skb2 = NULL; | 2017 | p->skb2 = NULL; |
2018 | } | 2018 | } |
2019 | sock_put(sk); | 2019 | sock_put(sk); |
2020 | |||
2021 | out: | ||
2022 | return 0; | ||
2023 | } | 2020 | } |
2024 | 2021 | ||
2025 | int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb, u32 portid, | 2022 | int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb, u32 portid, |