3 files changed, 16 insertions, 14 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 39471d3b31b9..ad0057db0f91 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -61,7 +61,7 @@
 #include <net/sctp/sm.h>
 
 /* Forward declarations for internal functions. */
-static void sctp_assoc_bh_rcv(struct sctp_association *asoc);
+static void sctp_assoc_bh_rcv(struct work_struct *work);
 
 
 /* 1st Level Abstractions. */
@@ -269,9 +269,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a
 
         /* Create an input queue.  */
         sctp_inq_init(&asoc->base.inqueue);
-        sctp_inq_set_th_handler(&asoc->base.inqueue,
-                                    (void (*)(void *))sctp_assoc_bh_rcv,
-                                    asoc);
+        sctp_inq_set_th_handler(&asoc->base.inqueue, sctp_assoc_bh_rcv);
 
         /* Create an output queue.  */
         sctp_outq_init(asoc, &asoc->outqueue);
@@ -946,8 +944,11 @@ out:
 }
 
 /* Do delayed input processing.  This is scheduled by sctp_rcv(). */
-static void sctp_assoc_bh_rcv(struct sctp_association *asoc)
+static void sctp_assoc_bh_rcv(struct work_struct *work)
 {
+        struct sctp_association *asoc =
+                container_of(work, struct sctp_association,
+                             base.inqueue.immediate);
         struct sctp_endpoint *ep;
         struct sctp_chunk *chunk;
         struct sock *sk;
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index 33a42e90c32f..129756908da4 100644
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -61,7 +61,7 @@
 #include <net/sctp/sm.h>
 
 /* Forward declarations for internal helpers. */
-static void sctp_endpoint_bh_rcv(struct sctp_endpoint *ep);
+static void sctp_endpoint_bh_rcv(struct work_struct *work);
 
 /*
  * Initialize the base fields of the endpoint structure.
@@ -89,8 +89,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
         sctp_inq_init(&ep->base.inqueue);
 
         /* Set its top-half handler */
-        sctp_inq_set_th_handler(&ep->base.inqueue,
-                                (void (*)(void *))sctp_endpoint_bh_rcv, ep);
+        sctp_inq_set_th_handler(&ep->base.inqueue, sctp_endpoint_bh_rcv);
 
         /* Initialize the bind addr area */
         sctp_bind_addr_init(&ep->base.bind_addr, 0);
@@ -318,8 +317,11 @@ int sctp_endpoint_is_peeled_off(struct sctp_endpoint *ep,
 /* Do delayed input processing.  This is scheduled by sctp_rcv().
  * This may be called on BH or task time.
  */
-static void sctp_endpoint_bh_rcv(struct sctp_endpoint *ep)
+static void sctp_endpoint_bh_rcv(struct work_struct *work)
 {
+        struct sctp_endpoint *ep =
+                container_of(work, struct sctp_endpoint,
+                             base.inqueue.immediate);
         struct sctp_association *asoc;
         struct sock *sk;
         struct sctp_transport *transport;
diff --git a/net/sctp/inqueue.c b/net/sctp/inqueue.c
index cf6deed7e849..71b07466e880 100644
--- a/net/sctp/inqueue.c
+++ b/net/sctp/inqueue.c
@@ -54,7 +54,7 @@ void sctp_inq_init(struct sctp_inq *queue)
         queue->in_progress = NULL;
 
         /* Create a task for delivering data.  */
-        INIT_WORK(&queue->immediate, NULL, NULL);
+        INIT_WORK(&queue->immediate, NULL);
 
         queue->malloced = 0;
 }
@@ -97,7 +97,7 @@ void sctp_inq_push(struct sctp_inq *q, struct sctp_chunk *chunk)
          * on the BH related data structures.
          */
         list_add_tail(&chunk->list, &q->in_chunk_list);
-        q->immediate.func(q->immediate.data);
+        q->immediate.func(&q->immediate);
 }
 
 /* Extract a chunk from an SCTP inqueue.
@@ -205,9 +205,8 @@ struct sctp_chunk *sctp_inq_pop(struct sctp_inq *queue)
  * The intent is that this routine will pull stuff out of the
  * inqueue and process it.
  */
-void sctp_inq_set_th_handler(struct sctp_inq *q,
-                                 void (*callback)(void *), void *arg)
+void sctp_inq_set_th_handler(struct sctp_inq *q, work_func_t callback)
 {
-        INIT_WORK(&q->immediate, callback, arg);
+        INIT_WORK(&q->immediate, callback);
 }