diff options
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/diag.c | 1 | ||||
| -rw-r--r-- | net/dccp/proto.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/dccp/diag.c b/net/dccp/diag.c index 5a45f8de5..2d84303ea 100644 --- a/net/dccp/diag.c +++ b/net/dccp/diag.c @@ -66,6 +66,7 @@ static const struct inet_diag_handler dccp_diag_handler = { .dump_one = dccp_diag_dump_one, .idiag_get_info = dccp_diag_get_info, .idiag_type = IPPROTO_DCCP, + .idiag_info_size = sizeof(struct tcp_info), }; static int __init dccp_diag_init(void) diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 52a940165..b5cf13a28 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -886,7 +886,7 @@ verify_sock_status: break; } - sk_wait_data(sk, &timeo); + sk_wait_data(sk, &timeo, NULL); continue; found_ok_skb: if (len > skb->len) |