diff options
-rw-r--r-- | include/linux/netlink.h | 2 | ||||
-rw-r--r-- | net/netlink/af_netlink.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 1f8c1a95f57c..a2092f582a78 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h | |||
@@ -225,6 +225,7 @@ struct netlink_callback { | |||
225 | int (*dump)(struct sk_buff * skb, | 225 | int (*dump)(struct sk_buff * skb, |
226 | struct netlink_callback *cb); | 226 | struct netlink_callback *cb); |
227 | int (*done)(struct netlink_callback *cb); | 227 | int (*done)(struct netlink_callback *cb); |
228 | void *data; | ||
228 | u16 family; | 229 | u16 family; |
229 | u16 min_dump_alloc; | 230 | u16 min_dump_alloc; |
230 | unsigned int prev_seq, seq; | 231 | 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) | |||
251 | struct netlink_dump_control { | 252 | struct netlink_dump_control { |
252 | int (*dump)(struct sk_buff *skb, struct netlink_callback *); | 253 | int (*dump)(struct sk_buff *skb, struct netlink_callback *); |
253 | int (*done)(struct netlink_callback*); | 254 | int (*done)(struct netlink_callback*); |
255 | void *data; | ||
254 | u16 min_dump_alloc; | 256 | u16 min_dump_alloc; |
255 | }; | 257 | }; |
256 | 258 | ||
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index ab74845876d2..32bb75324e76 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
@@ -1750,6 +1750,7 @@ int netlink_dump_start(struct sock *ssk, struct sk_buff *skb, | |||
1750 | cb->dump = control->dump; | 1750 | cb->dump = control->dump; |
1751 | cb->done = control->done; | 1751 | cb->done = control->done; |
1752 | cb->nlh = nlh; | 1752 | cb->nlh = nlh; |
1753 | cb->data = control->data; | ||
1753 | cb->min_dump_alloc = control->min_dump_alloc; | 1754 | cb->min_dump_alloc = control->min_dump_alloc; |
1754 | atomic_inc(&skb->users); | 1755 | atomic_inc(&skb->users); |
1755 | cb->skb = skb; | 1756 | cb->skb = skb; |