evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[INET_DIAG]: whitespace/simple cleanups

Browse source 
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo 2006-01-09 14:56:19 -08:00 • committed by David S. Miller
parent 7dbf075524
commit 4e852c0279
1 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
net/ipv4/inet_diag.c
View file

@ -185,7 +185,8 @@ nlmsg_failure:
return -1; return -1;
} }
static int inet_diag_get_exact(struct sk_buff *in_skb, const struct nlmsghdr *nlh) static int inet_diag_get_exact(struct sk_buff *in_skb,
const struct nlmsghdr *nlh)
{ {
int err; int err;
struct sock *sk; struct sock *sk;
@ -331,7 +332,8 @@ static int inet_diag_bc_run(const void *bc, int len,
else else
addr = entry->daddr; addr = entry->daddr;
if (bitstring_match(addr, cond->addr, cond->prefix_len)) if (bitstring_match(addr, cond->addr,
cond->prefix_len))
break; break;
if (entry->family == AF_INET6 && if (entry->family == AF_INET6 &&
cond->family == AF_INET) { cond->family == AF_INET) {
@ -449,8 +451,7 @@ static int inet_diag_dump_sock(struct sk_buff *skb, struct sock *sk,
} }
static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk, static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
struct request_sock *req, struct request_sock *req, u32 pid, u32 seq,
u32 pid, u32 seq,
const struct nlmsghdr *unlh) const struct nlmsghdr *unlh)
{ {
const struct inet_request_sock *ireq = inet_rsk(req); const struct inet_request_sock *ireq = inet_rsk(req);
@ -672,7 +673,6 @@ skip_listen_ht:
s_num = 0; s_num = 0;
read_lock_bh(&head->lock); read_lock_bh(&head->lock);
num = 0; num = 0;
sk_for_each(sk, node, &head->chain) { sk_for_each(sk, node, &head->chain) {
struct inet_sock *inet = inet_sk(sk); struct inet_sock *inet = inet_sk(sk);
@ -684,7 +684,8 @@ skip_listen_ht:
if (r->id.idiag_sport != inet->sport && if (r->id.idiag_sport != inet->sport &&
r->id.idiag_sport) r->id.idiag_sport)
goto next_normal; goto next_normal;
if (r->id.idiag_dport != inet->dport && r->id.idiag_dport) if (r->id.idiag_dport != inet->dport &&
r->id.idiag_dport)
goto next_normal; goto next_normal;
if (inet_diag_dump_sock(skb, sk, cb) < 0) { if (inet_diag_dump_sock(skb, sk, cb) < 0) {
read_unlock_bh(&head->lock); read_unlock_bh(&head->lock);
@ -724,8 +725,7 @@ done:
return skb->len; return skb->len;
} }
static __inline__ int static inline int inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
{ {
if (!(nlh->nlmsg_flags&NLM_F_REQUEST)) if (!(nlh->nlmsg_flags&NLM_F_REQUEST))
return 0; return 0;
@ -755,9 +755,8 @@ inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
} }
return netlink_dump_start(idiagnl, skb, nlh, return netlink_dump_start(idiagnl, skb, nlh,
inet_diag_dump, NULL); inet_diag_dump, NULL);
} else { } else
return inet_diag_get_exact(skb, nlh); return inet_diag_get_exact(skb, nlh);
}
err_inval: err_inval:
return -EINVAL; return -EINVAL;
@ -766,12 +765,12 @@ err_inval:
static inline void inet_diag_rcv_skb(struct sk_buff *skb) static inline void inet_diag_rcv_skb(struct sk_buff *skb)
{ {
int err;
struct nlmsghdr * nlh;
if (skb->len >= NLMSG_SPACE(0)) { if (skb->len >= NLMSG_SPACE(0)) {
nlh = (struct nlmsghdr *)skb->data; int err;
if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len) struct nlmsghdr *nlh = (struct nlmsghdr *)skb->data;
if (nlh->nlmsg_len < sizeof(*nlh) ||
skb->len < nlh->nlmsg_len)
return; return;
err = inet_diag_rcv_msg(skb, nlh); err = inet_diag_rcv_msg(skb, nlh);
if (err || nlh->nlmsg_flags & NLM_F_ACK) if (err || nlh->nlmsg_flags & NLM_F_ACK)