Merge branch 'tracing/urgent' into tracing/core

Merge reason: Pick up tracing/filters fix from the urgent queue,
              we will queue up dependent patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index 4a1dfe1f4ba9..210338ea222f 100644
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
@@ -78,18 +78,20 @@ void cn_queue_wrapper(struct work_struct *work)
         struct cn_callback_entry *cbq =
                 container_of(work, struct cn_callback_entry, work);
         struct cn_callback_data *d = &cbq->data;
+        struct cn_msg *msg = NLMSG_DATA(nlmsg_hdr(d->skb));
+        struct netlink_skb_parms *nsp = &NETLINK_CB(d->skb);
 
-        d->callback(d->callback_priv);
+        d->callback(msg, nsp);
 
-        d->destruct_data(d->ddata);
-        d->ddata = NULL;
+        kfree_skb(d->skb);
+        d->skb = NULL;
 
         kfree(d->free);
 }
 
 static struct cn_callback_entry *
 cn_queue_alloc_callback_entry(char *name, struct cb_id *id,
-                              void (*callback)(struct cn_msg *))
+                              void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
 {
         struct cn_callback_entry *cbq;
 
@@ -123,7 +125,7 @@ int cn_cb_equal(struct cb_id *i1, struct cb_id *i2)
 }
 
 int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id,
-                          void (*callback)(struct cn_msg *))
+                          void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
 {
         struct cn_callback_entry *cbq, *__cbq;
         int found = 0;