Merge tag 'rproc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad...

[karo-tx-linux.git] / net / ipv4 / inet_diag.c

diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index fcf281819cd48f51c824674fbb63673922d5cef0..8f8db724bfafe5f744a8f956dc7e710a67dc7faa 100644 (file)
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -141,7 +141,7 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
                        goto rtattr_failure;
 
        if (icsk == NULL) {
-               r->idiag_rqueue = r->idiag_wqueue = 0;
+               handler->idiag_get_info(sk, r, NULL);
                goto out;
        }
 
@@ -960,9 +960,12 @@ static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh)
                            inet_diag_bc_audit(nla_data(attr), nla_len(attr)))
                                return -EINVAL;
                }
-
-               return netlink_dump_start(sock_diag_nlsk, skb, nlh,
-                                         inet_diag_dump_compat, NULL, 0);
+               {
+                       struct netlink_dump_control c = {
+                               .dump = inet_diag_dump_compat,
+                       };
+                       return netlink_dump_start(sock_diag_nlsk, skb, nlh, &c);
+               }
        }
 
        return inet_diag_get_exact_compat(skb, nlh);
@@ -985,9 +988,12 @@ static int inet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
                            inet_diag_bc_audit(nla_data(attr), nla_len(attr)))
                                return -EINVAL;
                }
-
-               return netlink_dump_start(sock_diag_nlsk, skb, h,
-                                         inet_diag_dump, NULL, 0);
+               {
+                       struct netlink_dump_control c = {
+                               .dump = inet_diag_dump,
+                       };
+                       return netlink_dump_start(sock_diag_nlsk, skb, h, &c);
+               }
        }
 
        return inet_diag_get_exact(skb, h, (struct inet_diag_req_v2 *)NLMSG_DATA(h));