From cc48ad4c0cab282ce887a89e51872f1cc61f9264 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Fri, 24 Feb 2012 14:30:16 +0000
Subject: [PATCH] --- yaml --- r: 290483 b: refs/heads/master c:
 7175c883071515f0d4c1cece2646203b8a5a7415 h: refs/heads/master i:   290481:
 357a18f1261996b7d9195cf80cb676f63c6eb7e4   290479:
 3d4c95ce58548e02bcaf9cbb79006ffa22ef71e4 v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/netlink.h  | 2 ++
 trunk/net/netlink/af_netlink.c | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 758be889f4c9..125395a43ef1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80d326fab534a5380e8f6e509a0b9076655a9670
+refs/heads/master: 7175c883071515f0d4c1cece2646203b8a5a7415
diff --git a/trunk/include/linux/netlink.h b/trunk/include/linux/netlink.h
index 1f8c1a95f57c..a2092f582a78 100644
--- a/trunk/include/linux/netlink.h
+++ b/trunk/include/linux/netlink.h
@@ -225,6 +225,7 @@ struct netlink_callback {
 	int			(*dump)(struct sk_buff * skb,
 					struct netlink_callback *cb);
 	int			(*done)(struct netlink_callback *cb);
+	void			*data;
 	u16			family;
 	u16			min_dump_alloc;
 	unsigned int		prev_seq, seq;
@@ -251,6 +252,7 @@ __nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags)
 struct netlink_dump_control {
 	int (*dump)(struct sk_buff *skb, struct netlink_callback *);
 	int (*done)(struct netlink_callback*);
+	void *data;
 	u16 min_dump_alloc;
 };
 
diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c
index ab74845876d2..32bb75324e76 100644
--- a/trunk/net/netlink/af_netlink.c
+++ b/trunk/net/netlink/af_netlink.c
@@ -1750,6 +1750,7 @@ int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
 	cb->dump = control->dump;
 	cb->done = control->done;
 	cb->nlh = nlh;
+	cb->data = control->data;
 	cb->min_dump_alloc = control->min_dump_alloc;
 	atomic_inc(&skb->users);
 	cb->skb = skb;