lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

connector: Removed the destruct_data callback since it is always kfree_skb()

Browse Source 
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Acked-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Philipp Reisner
2009-10-02 02:40:07 +00:00
committed by David S. Miller
parent 18366b05a0
commit f1489cfb17
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/connector/cn_queue.c
View File

@@ -83,8 +83,8 @@ void cn_queue_wrapper(struct work_struct *work)
d->callback(msg, nsp); d->callback(msg, nsp);
d->destruct_data(d->ddata); kfree_skb(d->skb);
d->ddata = NULL; d->skb = NULL;
kfree(d->free); kfree(d->free);
} }

11
drivers/connector/connector.c
View File

@@ -129,7 +129,7 @@ EXPORT_SYMBOL_GPL(cn_netlink_send);
/* /*
* Callback helper - queues work and setup destructor for given data. * Callback helper - queues work and setup destructor for given data.
*/ */
static int cn_call_callback(struct sk_buff *skb, void (*destruct_data)(void *), void *data) static int cn_call_callback(struct sk_buff *skb)
{ {
struct cn_callback_entry *__cbq, *__new_cbq; struct cn_callback_entry *__cbq, *__new_cbq;
struct cn_dev *dev = &cdev; struct cn_dev *dev = &cdev;
@@ -140,12 +140,9 @@ static int cn_call_callback(struct sk_buff *skb, void (*destruct_data)(void *),
list_for_each_entry(__cbq, &dev->cbdev->queue_list, callback_entry) { list_for_each_entry(__cbq, &dev->cbdev->queue_list, callback_entry) {
if (cn_cb_equal(&__cbq->id.id, &msg->id)) { if (cn_cb_equal(&__cbq->id.id, &msg->id)) {
if (likely(!work_pending(&__cbq->work) && if (likely(!work_pending(&__cbq->work) &&
__cbq->data.ddata == NULL)) { __cbq->data.skb == NULL)) {
__cbq->data.skb = skb; __cbq->data.skb = skb;
__cbq->data.ddata = data;
__cbq->data.destruct_data = destruct_data;
if (queue_cn_work(__cbq, &__cbq->work)) if (queue_cn_work(__cbq, &__cbq->work))
err = 0; err = 0;
else else
@@ -159,8 +156,6 @@ static int cn_call_callback(struct sk_buff *skb, void (*destruct_data)(void *),
d = &__new_cbq->data; d = &__new_cbq->data;
d->skb = skb; d->skb = skb;
d->callback = __cbq->data.callback; d->callback = __cbq->data.callback;
d->ddata = data;
d->destruct_data = destruct_data;
d->free = __new_cbq; d->free = __new_cbq;
__new_cbq->pdev = __cbq->pdev; __new_cbq->pdev = __cbq->pdev;
@@ -208,7 +203,7 @@ static void cn_rx_skb(struct sk_buff *__skb)
return; return;
} }
err = cn_call_callback(skb, (void (*)(void *))kfree_skb, skb); err = cn_call_callback(skb);
if (err < 0) if (err < 0)
kfree_skb(skb); kfree_skb(skb);
} }

3
include/linux/connector.h
View File

@@ -132,9 +132,6 @@ struct cn_callback_id {
}; };
struct cn_callback_data { struct cn_callback_data {
void (*destruct_data) (void *);
void *ddata;
struct sk_buff *skb; struct sk_buff *skb;
void (*callback) (struct cn_msg *, struct netlink_skb_parms *); void (*callback) (struct cn_msg *, struct netlink_skb_parms *);