diff options
| author | Pavel Emelyanov <xemul@parallels.com> | 2011-12-09 06:21:34 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-09 14:14:07 -0500 |
| commit | 87c22ea52e1bb467f58b3e9a71509fccb70c7bd3 (patch) | |
| tree | 11d1d61703fa91c84546e94f371ce2efdea2215c /net/ipv4/inet_diag.c | |
| parent | 7b35eadd7eee2e0b42421ce3efbc30f1c3c745e5 (diff) | |
| download | linux-stable-87c22ea52e1bb467f58b3e9a71509fccb70c7bd3.tar.gz linux-stable-87c22ea52e1bb467f58b3e9a71509fccb70c7bd3.tar.bz2 linux-stable-87c22ea52e1bb467f58b3e9a71509fccb70c7bd3.zip | |
inet_diag: Reduce the number of args for bytecode run routine
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_diag.c')
| -rw-r--r-- | net/ipv4/inet_diag.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index a247f85571c4..bd3f661803a7 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -355,9 +355,12 @@ static int bitstring_match(const __be32 *a1, const __be32 *a2, int bits) } -static int inet_diag_bc_run(const void *bc, int len, - const struct inet_diag_entry *entry) +static int inet_diag_bc_run(const struct nlattr *_bc, + const struct inet_diag_entry *entry) { + const void *bc = nla_data(_bc); + int len = nla_len(_bc); + while (len > 0) { int yes = 1; const struct inet_diag_bc_op *op = bc; @@ -512,7 +515,7 @@ static int inet_csk_diag_dump(struct sock *sk, entry.dport = ntohs(inet->inet_dport); entry.userlocks = sk->sk_userlocks; - if (!inet_diag_bc_run(nla_data(bc), nla_len(bc), &entry)) + if (!inet_diag_bc_run(bc, &entry)) return 0; } @@ -547,7 +550,7 @@ static int inet_twsk_diag_dump(struct inet_timewait_sock *tw, entry.dport = ntohs(tw->tw_dport); entry.userlocks = 0; - if (!inet_diag_bc_run(nla_data(bc), nla_len(bc), &entry)) + if (!inet_diag_bc_run(bc, &entry)) return 0; } @@ -668,8 +671,7 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk, &ireq->rmt_addr; entry.dport = ntohs(ireq->rmt_port); - if (!inet_diag_bc_run(nla_data(bc), - nla_len(bc), &entry)) + if (!inet_diag_bc_run(bc, &entry)) continue; } |