summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamal Hadi Salim <hadi@cyberus.ca>2006-12-01 20:07:42 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:32:09 -0800
commita4d1366d5080fcb4514db58c320b9f60d78918e6 (patch)
tree8358724419b81add4a32e70d9bdcc4676ccd531e
parentc40a27f48ceee648e9cfdda040b69e7010d9f82c (diff)
[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>
-rw-r--r--include/net/genetlink.h2
-rw-r--r--net/netlink/genetlink.c2
2 files changed, 3 insertions, 1 deletions
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));