From: Jamal Hadi Salim <hadi@cyberus.ca>
Date: Sat, 2 Dec 2006 04:07:42 +0000 (-0800)
Subject: [GENETLINK]: Add cmd dump completion.
X-Git-Tag: v2.6.20-rc1~15^2~9^2~54
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=a4d1366d5080fcb4514db58c320b9f60d78918e6;p=cascardo%2Flinux.git

[GENETLINK]: Add cmd dump completion.

Remove assumption that generic netlink commands cannot have dump
completion callbacks.

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index 7fd131c9a8cc..adff4c898d50 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -53,6 +53,7 @@ struct genl_info
  * @policy: attribute validation policy
  * @doit: standard command callback
  * @dumpit: callback for dumpers
+ * @done: completion callback for dumps
  * @ops_list: operations list
  */
 struct genl_ops
@@ -64,6 +65,7 @@ struct genl_ops
 				       struct genl_info *info);
 	int		       (*dumpit)(struct sk_buff *skb,
 					 struct netlink_callback *cb);
+	int		       (*done)(struct netlink_callback *cb);
 	struct list_head	ops_list;
 };
 
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index cc874f0fcbdb..b9b03747c1f3 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -331,7 +331,7 @@ static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
 		}
 
 		*errp = err = netlink_dump_start(genl_sock, skb, nlh,
-						 ops->dumpit, NULL);
+						 ops->dumpit, ops->done);
 		if (err == 0)
 			skb_pull(skb, min(NLMSG_ALIGN(nlh->nlmsg_len),
 					  skb->len));