net: xfrm: convert tasklets to use new tasklet_setup() API

In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly.

Signed-off-by: Romain Perier <romain.perier@gmail.com>
Signed-off-by: Allen Pais <apais@linux.microsoft.com>
Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 37456d022cfa3a8717c5b0bf8b52c3d21cf91bda..be6351e3f3cdfaa6c15d1b824907042d0365731d 100644 (file)
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -760,9 +760,9 @@ int xfrm_input_resume(struct sk_buff *skb, int nexthdr)
 }
 EXPORT_SYMBOL(xfrm_input_resume);
 
-static void xfrm_trans_reinject(unsigned long data)
+static void xfrm_trans_reinject(struct tasklet_struct *t)
 {
-       struct xfrm_trans_tasklet *trans = (void *)data;
+       struct xfrm_trans_tasklet *trans = from_tasklet(trans, t, tasklet);
        struct sk_buff_head queue;
        struct sk_buff *skb;
 
@@ -818,7 +818,6 @@ void __init xfrm_input_init(void)
 
                trans = &per_cpu(xfrm_trans_tasklet, i);
                __skb_queue_head_init(&trans->queue);
-               tasklet_init(&trans->tasklet, xfrm_trans_reinject,
-                            (unsigned long)trans);
+               tasklet_setup(&trans->tasklet, xfrm_trans_reinject);
        }
 }