iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inet_diag: Remove indirect sizeof from inet diag handlers

Browse Source 
There's an info_size value stored on inet_diag_handler, but for existing
code this value is effectively constant, so just use sizeof(struct tcp_info)
where required.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2011-12-09 06:21:16 +00:00 committed by David S. Miller
parent a73ed26bba
commit 7b35eadd7e
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/inet_diag.h
View File

@ -141,7 +141,6 @@ struct inet_diag_handler {
void (*idiag_get_info)(struct sock *sk, void (*idiag_get_info)(struct sock *sk,
struct inet_diag_msg *r, struct inet_diag_msg *r,
void *info); void *info);
__u16 idiag_info_size;
__u16 idiag_type; __u16 idiag_type;
}; };

1
net/dccp/diag.c
View File

@ -52,7 +52,6 @@ static const struct inet_diag_handler dccp_diag_handler = {
.idiag_hashinfo = &dccp_hashinfo, .idiag_hashinfo = &dccp_hashinfo,
.idiag_get_info = dccp_diag_get_info, .idiag_get_info = dccp_diag_get_info,
.idiag_type = IPPROTO_DCCP, .idiag_type = IPPROTO_DCCP,
.idiag_info_size = sizeof(struct tcp_info),
}; };
static int __init dccp_diag_init(void) static int __init dccp_diag_init(void)

5
net/ipv4/inet_diag.c
View File

@ -98,8 +98,7 @@ static int inet_csk_diag_fill(struct sock *sk,
minfo = INET_DIAG_PUT(skb, INET_DIAG_MEMINFO, sizeof(*minfo)); minfo = INET_DIAG_PUT(skb, INET_DIAG_MEMINFO, sizeof(*minfo));
if (ext & (1 << (INET_DIAG_INFO - 1))) if (ext & (1 << (INET_DIAG_INFO - 1)))
info = INET_DIAG_PUT(skb, INET_DIAG_INFO, info = INET_DIAG_PUT(skb, INET_DIAG_INFO, sizeof(struct tcp_info));
handler->idiag_info_size);
if ((ext & (1 << (INET_DIAG_CONG - 1))) && icsk->icsk_ca_ops) { if ((ext & (1 << (INET_DIAG_CONG - 1))) && icsk->icsk_ca_ops) {
const size_t len = strlen(icsk->icsk_ca_ops->name); const size_t len = strlen(icsk->icsk_ca_ops->name);
@ -299,7 +298,7 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
err = -ENOMEM; err = -ENOMEM;
rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) + rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) +
sizeof(struct inet_diag_meminfo) + sizeof(struct inet_diag_meminfo) +
handler->idiag_info_size + 64)), sizeof(struct tcp_info) + 64)),
GFP_KERNEL); GFP_KERNEL);
if (!rep) if (!rep)
goto out; goto out;

1
net/ipv4/tcp_diag.c
View File

@ -38,7 +38,6 @@ static const struct inet_diag_handler tcp_diag_handler = {
.idiag_hashinfo = &tcp_hashinfo, .idiag_hashinfo = &tcp_hashinfo,
.idiag_get_info = tcp_diag_get_info, .idiag_get_info = tcp_diag_get_info,
.idiag_type = IPPROTO_TCP, .idiag_type = IPPROTO_TCP,
.idiag_info_size = sizeof(struct tcp_info),
}; };
static int __init tcp_diag_init(void) static int __init tcp_diag_init(void)