aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/connector
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/connector')
-rw-r--r--drivers/connector/cn_queue.c7
-rw-r--r--drivers/connector/connector.c4
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index b4cfac93f723..163c3e3d0d11 100644
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
@@ -79,8 +79,9 @@ void cn_queue_wrapper(struct work_struct *work)
79 container_of(work, struct cn_callback_entry, work); 79 container_of(work, struct cn_callback_entry, work);
80 struct cn_callback_data *d = &cbq->data; 80 struct cn_callback_data *d = &cbq->data;
81 struct cn_msg *msg = NLMSG_DATA(nlmsg_hdr(d->skb)); 81 struct cn_msg *msg = NLMSG_DATA(nlmsg_hdr(d->skb));
82 struct netlink_skb_parms *nsp = &NETLINK_CB(d->skb);
82 83
83 d->callback(msg); 84 d->callback(msg, nsp);
84 85
85 d->destruct_data(d->ddata); 86 d->destruct_data(d->ddata);
86 d->ddata = NULL; 87 d->ddata = NULL;
@@ -90,7 +91,7 @@ void cn_queue_wrapper(struct work_struct *work)
90 91
91static struct cn_callback_entry * 92static struct cn_callback_entry *
92cn_queue_alloc_callback_entry(char *name, struct cb_id *id, 93cn_queue_alloc_callback_entry(char *name, struct cb_id *id,
93 void (*callback)(struct cn_msg *)) 94 void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
94{ 95{
95 struct cn_callback_entry *cbq; 96 struct cn_callback_entry *cbq;
96 97
@@ -124,7 +125,7 @@ int cn_cb_equal(struct cb_id *i1, struct cb_id *i2)
124} 125}
125 126
126int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, 127int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id,
127 void (*callback)(struct cn_msg *)) 128 void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
128{ 129{
129 struct cn_callback_entry *cbq, *__cbq; 130 struct cn_callback_entry *cbq, *__cbq;
130 int found = 0; 131 int found = 0;
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index fc9887fa453f..e59f0ab8f828 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -269,7 +269,7 @@ static void cn_notify(struct cb_id *id, u32 notify_event)
269 * May sleep. 269 * May sleep.
270 */ 270 */
271int cn_add_callback(struct cb_id *id, char *name, 271int cn_add_callback(struct cb_id *id, char *name,
272 void (*callback)(struct cn_msg *)) 272 void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
273{ 273{
274 int err; 274 int err;
275 struct cn_dev *dev = &cdev; 275 struct cn_dev *dev = &cdev;
@@ -351,7 +351,7 @@ static int cn_ctl_msg_equals(struct cn_ctl_msg *m1, struct cn_ctl_msg *m2)
351 * 351 *
352 * Used for notification of a request's processing. 352 * Used for notification of a request's processing.
353 */ 353 */
354static void cn_callback(struct cn_msg *msg) 354static void cn_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp)
355{ 355{
356 struct cn_ctl_msg *ctl; 356 struct cn_ctl_msg *ctl;
357 struct cn_ctl_entry *ent; 357 struct cn_ctl_entry *ent;