netlink: add netlink_dump_control structure for netlink_dump_start()

[linux-flexiantxendom0-3.2.10.git] / net / unix / diag.c

diff --git a/net/unix/diag.c b/net/unix/diag.c
index 6b7697f..4195555 100644 (file)
--- a/net/unix/diag.c
+++ b/net/unix/diag.c
@@ -301,10 +301,12 @@ static int unix_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
        if (nlmsg_len(h) < hdrlen)
                return -EINVAL;
 
-       if (h->nlmsg_flags & NLM_F_DUMP)
-               return netlink_dump_start(sock_diag_nlsk, skb, h,
-                                         unix_diag_dump, NULL, 0);
-       else
+       if (h->nlmsg_flags & NLM_F_DUMP) {
+               struct netlink_dump_control c = {
+                       .dump = unix_diag_dump,
+               };
+               return netlink_dump_start(sock_diag_nlsk, skb, h, &c);
+       } else
                return unix_diag_get_exact(skb, h, (struct unix_diag_req *)NLMSG_DATA(h));
 }