From patchwork Wed Oct 7 10:12:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11820311 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BB9DC4363C for ; Wed, 7 Oct 2020 10:12:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A5EB320B1F for ; Wed, 7 Oct 2020 10:12:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lVZ/qrgv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727933AbgJGKMl (ORCPT ); Wed, 7 Oct 2020 06:12:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727297AbgJGKMl (ORCPT ); Wed, 7 Oct 2020 06:12:41 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49FEFC061755 for ; Wed, 7 Oct 2020 03:12:41 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id 7so1058245pgm.11 for ; Wed, 07 Oct 2020 03:12:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T/XYKCC2zWQ/TXZqr1X46RbRC8zh9kKIy6k3ZDTLGg4=; b=lVZ/qrgve8Q9Jc76SriBF6hRydhVuF4Geccethf7NFSzCI4i2yMoCfgy52f78hQub4 BEUZ4HRwanXO2UY/WCEULbwYo67Pma6jbnauvrW0YDRTG/mUSyh9oCJl3g1lkJYhsjG+ 4Z2Q4yRZzC02FfQjFD19FXAXwlvOSn04H7Slh2pSQjC64ZbCmLDtVawYI3FdpQl1fVGh gOlaRpUgwBoWaNaY14qohanl6Pq07KJXnXTSg/ondVsFVFO1ACqOdSXIOwvYHwot+goh 4mMO5xt/MroIXolBqxymX+zR3Dp5cZySEmRBbjNOGJNa5D1s+/sZM+ES5I4xRO3KUDVZ dsGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T/XYKCC2zWQ/TXZqr1X46RbRC8zh9kKIy6k3ZDTLGg4=; b=N6lVzg4jX/DaDryMvQIc1NONHi9D+njG1XvckPP+04fCa3iGuhwdVQloix6km+MWS0 5QdqN8z7NCfWykUPO4i2HsxIeTpHRWn4/HkZCRooAXSJK3uOEQFG9HL24PrU0k7qXI4V e0aXrdz/nfpLgQxQvQufvcVCnyjKAjm8Xa1WKEwo0mZgCJTuQLb2hlN6VuyHUXjQCq80 SXF5L/6DNVrbO/bx1hETEZyA9im31S6etnFosKx7cjW7SYO1Az7+IN9bMNb77ItqgpE5 XFUWICRiB0Evr2Ar/ddqKeW29peHCyxJh9TP+VGPkJBu+C/1WZkWZrt7Gfulne4lUcDE ZgWw== X-Gm-Message-State: AOAM532zrIyWveQpby84vJgDuxbAWjAVKJDTRM0Vivyp4WbVnZ28fNLV A3J1dxc1PG9XLgYvskX/dhQ= X-Google-Smtp-Source: ABdhPJwJwnBu4hpjodFdybJVBSz3n18feV03BrSGzAtlWbrcvMuU0akny3MHHf9KDg4VJhL7tUokTQ== X-Received: by 2002:a63:29c8:: with SMTP id p191mr2337835pgp.45.1602065560716; Wed, 07 Oct 2020 03:12:40 -0700 (PDT) Received: from localhost.localdomain ([49.207.204.22]) by smtp.gmail.com with ESMTPSA id q24sm1105291pgb.12.2020.10.07.03.12.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 03:12:40 -0700 (PDT) From: Allen Pais To: davem@davemloft.net Cc: gerrit@erg.abdn.ac.uk, kuba@kernel.org, edumazet@google.com, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, johannes@sipsolutions.net, alex.aring@gmail.com, stefan@datenfreihafen.org, santosh.shilimkar@oracle.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, steffen.klassert@secunet.com, herbert@gondor.apana.org.au, netdev@vger.kernel.org, Allen Pais , Romain Perier Subject: [net-next v2 1/8] net: dccp: convert tasklets to use new tasklet_setup() API Date: Wed, 7 Oct 2020 15:42:12 +0530 Message-Id: <20201007101219.356499-2-allen.lkml@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201007101219.356499-1-allen.lkml@gmail.com> References: <20201007101219.356499-1-allen.lkml@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Allen Pais 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 Signed-off-by: Allen Pais --- net/dccp/timer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/dccp/timer.c b/net/dccp/timer.c index a934d2932..db768f223 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c @@ -215,13 +215,14 @@ static void dccp_delack_timer(struct timer_list *t) /** * dccp_write_xmitlet - Workhorse for CCID packet dequeueing interface - * @data: Socket to act on + * @t: pointer to the tasklet associated with this handler * * See the comments above %ccid_dequeueing_decision for supported modes. */ -static void dccp_write_xmitlet(unsigned long data) +static void dccp_write_xmitlet(struct tasklet_struct *t) { - struct sock *sk = (struct sock *)data; + struct dccp_sock *dp = from_tasklet(dp, t, dccps_xmitlet); + struct sock *sk = &dp->dccps_inet_connection.icsk_inet.sk; bh_lock_sock(sk); if (sock_owned_by_user(sk)) @@ -235,16 +236,15 @@ static void dccp_write_xmitlet(unsigned long data) static void dccp_write_xmit_timer(struct timer_list *t) { struct dccp_sock *dp = from_timer(dp, t, dccps_xmit_timer); - struct sock *sk = &dp->dccps_inet_connection.icsk_inet.sk; - dccp_write_xmitlet((unsigned long)sk); + dccp_write_xmitlet(&dp->dccps_xmitlet); } void dccp_init_xmit_timers(struct sock *sk) { struct dccp_sock *dp = dccp_sk(sk); - tasklet_init(&dp->dccps_xmitlet, dccp_write_xmitlet, (unsigned long)sk); + tasklet_setup(&dp->dccps_xmitlet, dccp_write_xmitlet); timer_setup(&dp->dccps_xmit_timer, dccp_write_xmit_timer, 0); inet_csk_init_xmit_timers(sk, &dccp_write_timer, &dccp_delack_timer, &dccp_keepalive_timer); From patchwork Wed Oct 7 10:12:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11820313 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9DA47C4363C for ; Wed, 7 Oct 2020 10:12:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4124B20B1F for ; Wed, 7 Oct 2020 10:12:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BFA9QnF6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727948AbgJGKMs (ORCPT ); Wed, 7 Oct 2020 06:12:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727297AbgJGKMs (ORCPT ); Wed, 7 Oct 2020 06:12:48 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F067BC061755 for ; Wed, 7 Oct 2020 03:12:47 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id g29so1093347pgl.2 for ; Wed, 07 Oct 2020 03:12:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X7q08WJPRaUgkdBI6ZeZlBDNumfcd2QVr0PmpHExqCk=; b=BFA9QnF6jpkTX99GpicyN62oLT0R2hhveyUCW3leYcQjAX13zQTTNOgwG0shvYfDHk J1wWdBocVjyDqJPDWq6192owzS2VUEN2zunPPLL24cMzRGGFDSGCy3j/q10UkqU4tEE8 AAHSTTLE+MfDh8RYMC+yKrqWm/sBc75uncSDgmccrrrrktl9uM+2aI4S8ve4F5jFlioJ lwyThCfRiPEdtHCGBEmDQZKSio3L2qiYcDyHRO0gEVMxrbm7v+Z9R/Y02TnZTU0wVwu1 F//w+MEBE7mTGtBtyTM93/g9qzylFNJco+BpMMxSQsWc0VvuRQuEspUDCubl4zVWYTKc dnoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X7q08WJPRaUgkdBI6ZeZlBDNumfcd2QVr0PmpHExqCk=; b=rAK+267a1Rmaj/TnohEkv0i8QzwhdtOXRkthc/LvjULng/pw3SAoX5471ezyG+tGbL p6oSPB20Xj1+LOqH/ElRpnDMfwB6gwBew96rKtp6em+X2f1rYrjSJOw+oQ1sgZUEtkkm VT07Dvn+YYcUYUDRUV0cHhU1sH8F7wdXswibZI4QhWRf573L+ZnT1hG2eC6W/EmCNPdN 0YDBPR91GAxcejbmuLgqL2HSCUd5c3SJpP1znUxesAtjwejpFKII5TzWdPQawt1KM+hv VGrD7UXiLXWW9npEwlPjOba1ezdh8dk61C4DyDgliit2K/UuHOYaUXW7wYBNfzH9TJqu wxFA== X-Gm-Message-State: AOAM530/GmZO3E7tCjyNs37PX9IbC+m4ntjhCNtBJoXks1+tMi0UjLie 9TGFcKF2IVR0Q5QCfgxIUpo= X-Google-Smtp-Source: ABdhPJxDdJoZigi7hmNcKWivfWP6qRPYwJf+fz8i2s84XVIHy0iglls19j9ioXFEERxQXiGuk1+GmQ== X-Received: by 2002:a62:1a95:0:b029:151:d47e:119b with SMTP id a143-20020a621a950000b0290151d47e119bmr2371754pfa.46.1602065567562; Wed, 07 Oct 2020 03:12:47 -0700 (PDT) Received: from localhost.localdomain ([49.207.204.22]) by smtp.gmail.com with ESMTPSA id q24sm1105291pgb.12.2020.10.07.03.12.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 03:12:47 -0700 (PDT) From: Allen Pais To: davem@davemloft.net Cc: gerrit@erg.abdn.ac.uk, kuba@kernel.org, edumazet@google.com, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, johannes@sipsolutions.net, alex.aring@gmail.com, stefan@datenfreihafen.org, santosh.shilimkar@oracle.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, steffen.klassert@secunet.com, herbert@gondor.apana.org.au, netdev@vger.kernel.org, Allen Pais , Romain Perier Subject: [net-next v2 2/8] net: ipv4: convert tasklets to use new tasklet_setup() API Date: Wed, 7 Oct 2020 15:42:13 +0530 Message-Id: <20201007101219.356499-3-allen.lkml@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201007101219.356499-1-allen.lkml@gmail.com> References: <20201007101219.356499-1-allen.lkml@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Allen Pais 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 Signed-off-by: Allen Pais --- net/ipv4/tcp_output.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index bf48cd73e..6e998d428 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1038,9 +1038,9 @@ static void tcp_tsq_handler(struct sock *sk) * transferring tsq->head because tcp_wfree() might * interrupt us (non NAPI drivers) */ -static void tcp_tasklet_func(unsigned long data) +static void tcp_tasklet_func(struct tasklet_struct *t) { - struct tsq_tasklet *tsq = (struct tsq_tasklet *)data; + struct tsq_tasklet *tsq = from_tasklet(tsq, t, tasklet); LIST_HEAD(list); unsigned long flags; struct list_head *q, *n; @@ -1125,9 +1125,7 @@ void __init tcp_tasklet_init(void) struct tsq_tasklet *tsq = &per_cpu(tsq_tasklet, i); INIT_LIST_HEAD(&tsq->head); - tasklet_init(&tsq->tasklet, - tcp_tasklet_func, - (unsigned long)tsq); + tasklet_setup(&tsq->tasklet, tcp_tasklet_func); } } From patchwork Wed Oct 7 10:12:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11820315 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75BB7C4363C for ; Wed, 7 Oct 2020 10:12:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0846720B1F for ; Wed, 7 Oct 2020 10:12:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ekk7lGun" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727958AbgJGKMz (ORCPT ); Wed, 7 Oct 2020 06:12:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727297AbgJGKMy (ORCPT ); Wed, 7 Oct 2020 06:12:54 -0400 Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A82D4C061755 for ; Wed, 7 Oct 2020 03:12:54 -0700 (PDT) Received: by mail-pf1-x442.google.com with SMTP id l126so1069674pfd.5 for ; Wed, 07 Oct 2020 03:12:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z5OunPFStjs4HMvaYm8EjgeNUx/EpSL1WD0hDTrNWbI=; b=Ekk7lGunnVJ8afXxNlM8fL1IENf2Lxco3hR/XucFGqzRNzq7h7qEtefWqIT1p++Sy/ jZdc1o4pK2NfnDBR8BMiD70Gbtn5fuR3ud2FrO3bwnGhQ/pIkp+z5QA6IBcQFJ2TkBCU tRxg0TZA3vqp0AOT4AVsFyrVelS1Ex/bxPAXb7/gXm8e1MpDvQbBWjIRP6WKCp/vbjzv 9C8KxvYMkgPxihNkHPI7qYCftMqHKvhVZbT0U+i4KXZCsHSXEmkiwT6Ffy3FCHpv0b4U JEF91iFeaCVQB0qKIa3wLn9i+B4wW5hdF/jQPouv5YXTEwJbmBW27nNjxm7HszG91Wl6 nm9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z5OunPFStjs4HMvaYm8EjgeNUx/EpSL1WD0hDTrNWbI=; b=mV6sqF0f2mpNgnHatN64PU/uheyTvcz1yi82EOlad1HjFR66Tpr1U3F/DiqNn1swTF xedSgDVtNwd8gzdz+Th7kbq4qOQoYwcJlNMh7c61eksUalB5SjSXov5XbPZR36jkzfdm ADQULB6EqNWWBswkOkjpj9I6hPuGackK9BXnczYY1TNpV0HAbBAP3j8Hw4Mtm1VPkT/i 2dYaNEm2acSs5L9CcfbY9PPa4PPWCqDeO/+Kko8JBUMEIWACw1zeicEGB3Im5N6NSPip 1XycXGP5qKrRP6REEDiHogwHYlhEDT05sL2hErz9p+/JXfjKkL6G6DH4YwFdQG/M9QXE AQ5Q== X-Gm-Message-State: AOAM531BLdJ92KDBva6BhXcYOQpmAEfC5i4EUuq80/v92d5ftYO7Yd77 isp4YpNrhEiVlULi/wevuJE= X-Google-Smtp-Source: ABdhPJy7vkzDkf1PP/n/7I1jJdS9EzLrE0uIK7vW/UQhDSaOoEAkqo+ga0zJWiNl6XhuYB2AThNGsw== X-Received: by 2002:a62:6044:0:b029:151:1a04:895 with SMTP id u65-20020a6260440000b02901511a040895mr2337057pfb.34.1602065574264; Wed, 07 Oct 2020 03:12:54 -0700 (PDT) Received: from localhost.localdomain ([49.207.204.22]) by smtp.gmail.com with ESMTPSA id q24sm1105291pgb.12.2020.10.07.03.12.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 03:12:53 -0700 (PDT) From: Allen Pais To: davem@davemloft.net Cc: gerrit@erg.abdn.ac.uk, kuba@kernel.org, edumazet@google.com, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, johannes@sipsolutions.net, alex.aring@gmail.com, stefan@datenfreihafen.org, santosh.shilimkar@oracle.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, steffen.klassert@secunet.com, herbert@gondor.apana.org.au, netdev@vger.kernel.org, Allen Pais , Romain Perier Subject: [net-next v2 3/8] net: mac80211: convert tasklets to use new tasklet_setup() API Date: Wed, 7 Oct 2020 15:42:14 +0530 Message-Id: <20201007101219.356499-4-allen.lkml@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201007101219.356499-1-allen.lkml@gmail.com> References: <20201007101219.356499-1-allen.lkml@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Allen Pais 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 Signed-off-by: Allen Pais Reviewed-by: Johannes Berg --- net/mac80211/ieee80211_i.h | 4 ++-- net/mac80211/main.c | 14 +++++--------- net/mac80211/tx.c | 5 +++-- net/mac80211/util.c | 5 +++-- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index c3e357857..6d083a146 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1795,7 +1795,7 @@ static inline bool ieee80211_sdata_running(struct ieee80211_sub_if_data *sdata) /* tx handling */ void ieee80211_clear_tx_pending(struct ieee80211_local *local); -void ieee80211_tx_pending(unsigned long data); +void ieee80211_tx_pending(struct tasklet_struct *t); netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev); netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, @@ -2143,7 +2143,7 @@ void ieee80211_txq_remove_vlan(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata); void ieee80211_fill_txq_stats(struct cfg80211_txq_stats *txqstats, struct txq_info *txqi); -void ieee80211_wake_txqs(unsigned long data); +void ieee80211_wake_txqs(struct tasklet_struct *t); void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata, u16 transaction, u16 auth_alg, u16 status, const u8 *extra, size_t extra_len, const u8 *bssid, diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 523380aed..48ab05186 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -220,9 +220,9 @@ u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata) BSS_CHANGED_ERP_SLOT; } -static void ieee80211_tasklet_handler(unsigned long data) +static void ieee80211_tasklet_handler(struct tasklet_struct *t) { - struct ieee80211_local *local = (struct ieee80211_local *) data; + struct ieee80211_local *local = from_tasklet(local, t, tasklet); struct sk_buff *skb; while ((skb = skb_dequeue(&local->skb_queue)) || @@ -733,16 +733,12 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, skb_queue_head_init(&local->pending[i]); atomic_set(&local->agg_queue_stop[i], 0); } - tasklet_init(&local->tx_pending_tasklet, ieee80211_tx_pending, - (unsigned long)local); + tasklet_setup(&local->tx_pending_tasklet, ieee80211_tx_pending); if (ops->wake_tx_queue) - tasklet_init(&local->wake_txqs_tasklet, ieee80211_wake_txqs, - (unsigned long)local); + tasklet_setup(&local->wake_txqs_tasklet, ieee80211_wake_txqs); - tasklet_init(&local->tasklet, - ieee80211_tasklet_handler, - (unsigned long) local); + tasklet_setup(&local->tasklet, ieee80211_tasklet_handler); skb_queue_head_init(&local->skb_queue); skb_queue_head_init(&local->skb_queue_unreliable); diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 8ba10a48d..a50c0edb1 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -4406,9 +4406,10 @@ static bool ieee80211_tx_pending_skb(struct ieee80211_local *local, /* * Transmit all pending packets. Called from tasklet. */ -void ieee80211_tx_pending(unsigned long data) +void ieee80211_tx_pending(struct tasklet_struct *t) { - struct ieee80211_local *local = (struct ieee80211_local *)data; + struct ieee80211_local *local = from_tasklet(local, t, + tx_pending_tasklet); unsigned long flags; int i; bool txok; diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 493420604..a25e47750 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -386,9 +386,10 @@ _ieee80211_wake_txqs(struct ieee80211_local *local, unsigned long *flags) rcu_read_unlock(); } -void ieee80211_wake_txqs(unsigned long data) +void ieee80211_wake_txqs(struct tasklet_struct *t) { - struct ieee80211_local *local = (struct ieee80211_local *)data; + struct ieee80211_local *local = from_tasklet(local, t, + wake_txqs_tasklet); unsigned long flags; spin_lock_irqsave(&local->queue_stop_reason_lock, flags); From patchwork Wed Oct 7 10:12:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11820317 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A734C41604 for ; Wed, 7 Oct 2020 10:13:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 087C6212CC for ; Wed, 7 Oct 2020 10:13:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TEJGSJP9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727976AbgJGKNB (ORCPT ); Wed, 7 Oct 2020 06:13:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727961AbgJGKNB (ORCPT ); Wed, 7 Oct 2020 06:13:01 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A9C3C061755 for ; Wed, 7 Oct 2020 03:13:01 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id d23so756606pll.7 for ; Wed, 07 Oct 2020 03:13:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JkpW5sYQp+WHwyG8rahX3zSSTq1sUQxajkELy1EMCx4=; b=TEJGSJP9gJn/lrCZvkiKWY+j9QVW4QG5sxgrhUaWAqNruqZURmBqqtw27mbGO3YNjh po3ocltitbdMz5eGevfIBsmWYsLyDlaLqcnSDvU2Bf9j9tNrwHgy+Cuc7vYB8PgkR8A/ VXxLt+bm1rZhdrsmNN+XGu9j3i7GRM+WfHown4R1ZGLcKWy8atf1m7Xh1XqNbzYC1vhc ndy+pmusVi1Gd66V4/ur7G5iQ6El6Ot90z0hKTP7ehLchyAJUlOpI9u6Bm4WqKyBsuXk RtTRyiW4B9BVA29LTqZEdoKbNdNICdsv/ld3MebqKnpBkLp6OJFQ+9p5Q44Pj+HlSltu XsWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JkpW5sYQp+WHwyG8rahX3zSSTq1sUQxajkELy1EMCx4=; b=jOBDszb3dyDDEMcmYyYT+koqRjlfYacFdnXMke2gPA4q0mMAsHYQ0DpOYm4kIGVvvc EDMRQpsG+ZCzxPqZD8pBJeCQOVqkCIpOQ+9jltlle1lp0lJoux8tcacH2MJMchbF51Cg rdbZvvHTZmtVT7mFGtT0FFc2L7+uQ8X4rcBToe4YPwH6let8vL+1UOdn1JS5tLV94Prn lZUmxwATNTDOQLx+ioCIvv3/FUYh3FX5MYk7u5CAzhuZyqE91t2bgrRhengbQ4OWSZKv uGazq/tOxjCGFWIH1fZy5OB/izEUQcx4P8J8LlZ49+AWBj0XprW03ncnVNC2hTRv1ng9 cCiQ== X-Gm-Message-State: AOAM5333BiUasSJyUDefB0p6gt55pJtMsFN5rMnGrwY3KOG/twSDnJSn 4CJ9UyKFghBvfougzFIwcQQ= X-Google-Smtp-Source: ABdhPJxYUWlnC2dEy9AAlyAmdPqm4yEr90frDrCiTFekiy6vnn2nzW+z26cD8q8HRbZnUKak4Ax30A== X-Received: by 2002:a17:90b:19c4:: with SMTP id nm4mr2116837pjb.133.1602065580870; Wed, 07 Oct 2020 03:13:00 -0700 (PDT) Received: from localhost.localdomain ([49.207.204.22]) by smtp.gmail.com with ESMTPSA id q24sm1105291pgb.12.2020.10.07.03.12.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 03:13:00 -0700 (PDT) From: Allen Pais To: davem@davemloft.net Cc: gerrit@erg.abdn.ac.uk, kuba@kernel.org, edumazet@google.com, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, johannes@sipsolutions.net, alex.aring@gmail.com, stefan@datenfreihafen.org, santosh.shilimkar@oracle.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, steffen.klassert@secunet.com, herbert@gondor.apana.org.au, netdev@vger.kernel.org, Allen Pais , Romain Perier Subject: [net-next v2 4/8] net: mac802154: convert tasklets to use new tasklet_setup() API Date: Wed, 7 Oct 2020 15:42:15 +0530 Message-Id: <20201007101219.356499-5-allen.lkml@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201007101219.356499-1-allen.lkml@gmail.com> References: <20201007101219.356499-1-allen.lkml@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Allen Pais 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. Acked-by: Stefan Schmidt Signed-off-by: Romain Perier Signed-off-by: Allen Pais --- net/mac802154/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net/mac802154/main.c b/net/mac802154/main.c index 06ea0f8bf..520cedc59 100644 --- a/net/mac802154/main.c +++ b/net/mac802154/main.c @@ -20,9 +20,9 @@ #include "ieee802154_i.h" #include "cfg.h" -static void ieee802154_tasklet_handler(unsigned long data) +static void ieee802154_tasklet_handler(struct tasklet_struct *t) { - struct ieee802154_local *local = (struct ieee802154_local *)data; + struct ieee802154_local *local = from_tasklet(local, t, tasklet); struct sk_buff *skb; while ((skb = skb_dequeue(&local->skb_queue))) { @@ -91,9 +91,7 @@ ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops) INIT_LIST_HEAD(&local->interfaces); mutex_init(&local->iflist_mtx); - tasklet_init(&local->tasklet, - ieee802154_tasklet_handler, - (unsigned long)local); + tasklet_setup(&local->tasklet, ieee802154_tasklet_handler); skb_queue_head_init(&local->skb_queue); From patchwork Wed Oct 7 10:12:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11820321 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28FCBC4363C for ; Wed, 7 Oct 2020 10:13:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B099320782 for ; Wed, 7 Oct 2020 10:13:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Fh0cl1sp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727995AbgJGKNI (ORCPT ); Wed, 7 Oct 2020 06:13:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727297AbgJGKNI (ORCPT ); Wed, 7 Oct 2020 06:13:08 -0400 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13D0DC061755 for ; Wed, 7 Oct 2020 03:13:08 -0700 (PDT) Received: by mail-pf1-x441.google.com with SMTP id n14so1064614pff.6 for ; Wed, 07 Oct 2020 03:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=75sqOIr03Ig/QRCpnr1LikfBIGNMbZpFkpCO8G+MCV8=; b=Fh0cl1sp+0EY0fprykVC/7Wd1M4d81zpYSmhFw0PutVDzDRg+Wt+JvNedT3MPbAo3p W/pV5mMTWZrMB+E1FB4OUiPTJZSSbF+nPoJcDeNO2KDGYjhFsfEctXYAOFSxBpSVgJbV Ifzp4lYi2kD61TGNoan+BkpUNuE0gDaYMM+0ckBDep8I9Ecujp2fCFvNoipwizuS7CXM yhAgKDRyfhowxM3pFOuXnxP2Muc3ouA+ZaDk4Uq9pHSzVfkgtx5WdW111Ia6QbR2pd/R DYGsMYYvWMsXpg7uEq5yLWdqUdFkjBtYezpbPakqhAOgvwawEpfKe+3BL6ejKiaUxZkk 0K7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=75sqOIr03Ig/QRCpnr1LikfBIGNMbZpFkpCO8G+MCV8=; b=R8MzimOtOn4i6dkdHg6kPA+MwrZP1R0S3bG3ga1ZGFgK421FqSpBVjrhHtblLD1U2J CImsinU10Ft5LW8i75T0NwfEy3nEEmdL/2NAXHiPIKHc8Dp6UveQxlHzrmZHogiEB9Qy tDg9u3xSfkSQrqB71/9BkxVFdHupLpnWUGZ2SKLFGZAtnHYxJKSOU7SbYC/wfG7lKi7Z KCO3wY0FDT88ChEFnM+DpATMUPPsMUUEgHMPWeETR/6M85MxK6nf6THkJR9aHo6N8Pca 8wrzncyLnextE8muNOakWkeBXZG6RahYKsJMTKtP2Op2TBm7tDYtyxhlYBfMponppsyC FocA== X-Gm-Message-State: AOAM5330EVxhOJQymAoZghVRDRps4AcRaEBft69s6LDFC4prNXXb2HUM KfhFIXOoORB7Z6diKWC5UVE= X-Google-Smtp-Source: ABdhPJwWHVuWdHTMSNDTySxo21vxWkYDq4rW5kxYCkQR/aaM93bPL8VyjhvE54GIuNI2H/y4PJWxmQ== X-Received: by 2002:a65:6a0a:: with SMTP id m10mr2325317pgu.162.1602065587654; Wed, 07 Oct 2020 03:13:07 -0700 (PDT) Received: from localhost.localdomain ([49.207.204.22]) by smtp.gmail.com with ESMTPSA id q24sm1105291pgb.12.2020.10.07.03.13.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 03:13:07 -0700 (PDT) From: Allen Pais To: davem@davemloft.net Cc: gerrit@erg.abdn.ac.uk, kuba@kernel.org, edumazet@google.com, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, johannes@sipsolutions.net, alex.aring@gmail.com, stefan@datenfreihafen.org, santosh.shilimkar@oracle.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, steffen.klassert@secunet.com, herbert@gondor.apana.org.au, netdev@vger.kernel.org, Allen Pais , Romain Perier Subject: [net-next v2 5/8] net: rds: convert tasklets to use new tasklet_setup() API Date: Wed, 7 Oct 2020 15:42:16 +0530 Message-Id: <20201007101219.356499-6-allen.lkml@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201007101219.356499-1-allen.lkml@gmail.com> References: <20201007101219.356499-1-allen.lkml@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Allen Pais 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 Signed-off-by: Allen Pais --- net/rds/ib_cm.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index 06603dd1c..396d6abf8 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c @@ -314,9 +314,9 @@ static void poll_scq(struct rds_ib_connection *ic, struct ib_cq *cq, } } -static void rds_ib_tasklet_fn_send(unsigned long data) +static void rds_ib_tasklet_fn_send(struct tasklet_struct *t) { - struct rds_ib_connection *ic = (struct rds_ib_connection *)data; + struct rds_ib_connection *ic = from_tasklet(ic, t, i_send_tasklet); struct rds_connection *conn = ic->conn; rds_ib_stats_inc(s_ib_tasklet_call); @@ -354,9 +354,9 @@ static void poll_rcq(struct rds_ib_connection *ic, struct ib_cq *cq, } } -static void rds_ib_tasklet_fn_recv(unsigned long data) +static void rds_ib_tasklet_fn_recv(struct tasklet_struct *t) { - struct rds_ib_connection *ic = (struct rds_ib_connection *)data; + struct rds_ib_connection *ic = from_tasklet(ic, t, i_recv_tasklet); struct rds_connection *conn = ic->conn; struct rds_ib_device *rds_ibdev = ic->rds_ibdev; struct rds_ib_ack_state state; @@ -1218,10 +1218,8 @@ int rds_ib_conn_alloc(struct rds_connection *conn, gfp_t gfp) } INIT_LIST_HEAD(&ic->ib_node); - tasklet_init(&ic->i_send_tasklet, rds_ib_tasklet_fn_send, - (unsigned long)ic); - tasklet_init(&ic->i_recv_tasklet, rds_ib_tasklet_fn_recv, - (unsigned long)ic); + tasklet_setup(&ic->i_send_tasklet, rds_ib_tasklet_fn_send); + tasklet_setup(&ic->i_recv_tasklet, rds_ib_tasklet_fn_recv); mutex_init(&ic->i_recv_mutex); #ifndef KERNEL_HAS_ATOMIC64 spin_lock_init(&ic->i_ack_lock); From patchwork Wed Oct 7 10:12:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11820323 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B745DC4363D for ; Wed, 7 Oct 2020 10:13:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5279120B1F for ; Wed, 7 Oct 2020 10:13:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ASqNQTy2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728000AbgJGKNP (ORCPT ); Wed, 7 Oct 2020 06:13:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727297AbgJGKNO (ORCPT ); Wed, 7 Oct 2020 06:13:14 -0400 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD691C061755 for ; Wed, 7 Oct 2020 03:13:14 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id j8so798789pjy.5 for ; Wed, 07 Oct 2020 03:13:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZXcGDdp/F4MDe0wlnitN/mVcmbFUqJgXDXsl2Sj2Io4=; b=ASqNQTy2OP6WI9QiCqc3IIHsfb98jIlfwQbFNu6lazi04kRaetsbGtgIoWCn2cCAI0 g/lCCBJwWkbxdSHei8C0l7jeQ3+Rk6KYEbkZmLdMI2CeBnyiWZMgMlOAc7glIVS0e81i VjXi/C1nff46lzJxq5iLkldWvVB/5/Xyxu2kLK1N4r5fu+Kxb77axx78MIEdgOD4n46W tN7OY1UptLzUkfA7ikQ/VHg8zsDbFj6w0CwlNqnQHyRvy0EIC9XrtOffTfEgIiRHgwu7 2D28K6eV8SLQs6DOTFbPFXJnWxximW5tFRsWNDPVfDOsQJYHwtQeCpIkcl76XNsml0NG /4Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZXcGDdp/F4MDe0wlnitN/mVcmbFUqJgXDXsl2Sj2Io4=; b=Dvw/JakyAfE2ywgefOC1XbLqH8J8g3dSeY/4ZyTxCpS5Aedj8UR/RNkUQVAoZORrqA AuryAsYjq83iE3U+Ng8DrnlcASLazW+Rg5iDOHT7IlH25jlmTWRPKl5cII/WrAmxqnsr qvbOEk/hCdIZ+YxHmgidszCGci7qZ1WMH06qzo3g4kd8w8PqGyphqwaLb35j9tzsj0us +GuXZ39ZlJl5HKpZj8sKaeiGMj/rj4ngwA5cvP8N6lZBhS7xrTXj/dB7K82GGP8yTXPl TzjWBjDnSZO9W5UoIWHXr6EdkQEAXu9fVUJHNmK6qBOE51yPLb48QSCYd80mWFs2XFI6 Oa7g== X-Gm-Message-State: AOAM533aIfcobIHF8TEtwJyAMGWrPMxe0UqbikyLIJuT0LEGdHj1tFgR U3oD29BXjSpqFPrRg5TtQok= X-Google-Smtp-Source: ABdhPJwiYvykiaE9/BI7vc4gvOnNYDGx4fwnH104ZZ80xyVvQHUFNUkTuUrw2en6GlYdXg/kDnmTuw== X-Received: by 2002:a17:902:bd92:b029:d3:8087:c6c9 with SMTP id q18-20020a170902bd92b02900d38087c6c9mr2169898pls.53.1602065594496; Wed, 07 Oct 2020 03:13:14 -0700 (PDT) Received: from localhost.localdomain ([49.207.204.22]) by smtp.gmail.com with ESMTPSA id q24sm1105291pgb.12.2020.10.07.03.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 03:13:13 -0700 (PDT) From: Allen Pais To: davem@davemloft.net Cc: gerrit@erg.abdn.ac.uk, kuba@kernel.org, edumazet@google.com, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, johannes@sipsolutions.net, alex.aring@gmail.com, stefan@datenfreihafen.org, santosh.shilimkar@oracle.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, steffen.klassert@secunet.com, herbert@gondor.apana.org.au, netdev@vger.kernel.org, Allen Pais , Romain Perier Subject: [net-next v2 6/8] net: sched: convert tasklets to use new tasklet_setup() API Date: Wed, 7 Oct 2020 15:42:17 +0530 Message-Id: <20201007101219.356499-7-allen.lkml@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201007101219.356499-1-allen.lkml@gmail.com> References: <20201007101219.356499-1-allen.lkml@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Allen Pais 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 Signed-off-by: Allen Pais --- net/sched/sch_atm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index 1c281cc81..0a4452178 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c @@ -466,10 +466,11 @@ drop: __maybe_unused * non-ATM interfaces. */ -static void sch_atm_dequeue(unsigned long data) +static void sch_atm_dequeue(struct tasklet_struct *t) { - struct Qdisc *sch = (struct Qdisc *)data; - struct atm_qdisc_data *p = qdisc_priv(sch); + struct atm_qdisc_data *p = from_tasklet(p, t, task); + struct Qdisc *sch = (struct Qdisc *)((char *) p - + QDISC_ALIGN(sizeof(struct Qdisc))); struct atm_flow_data *flow; struct sk_buff *skb; @@ -563,7 +564,7 @@ static int atm_tc_init(struct Qdisc *sch, struct nlattr *opt, if (err) return err; - tasklet_init(&p->task, sch_atm_dequeue, (unsigned long)sch); + tasklet_setup(&p->task, sch_atm_dequeue); return 0; } From patchwork Wed Oct 7 10:12:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11820325 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2E15C4363C for ; Wed, 7 Oct 2020 10:13:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 645AF20872 for ; Wed, 7 Oct 2020 10:13:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rODrqZUr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728024AbgJGKNY (ORCPT ); Wed, 7 Oct 2020 06:13:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727297AbgJGKNV (ORCPT ); Wed, 7 Oct 2020 06:13:21 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEDF2C061755 for ; Wed, 7 Oct 2020 03:13:21 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id t23so2616259pji.0 for ; Wed, 07 Oct 2020 03:13:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jGHPc0wsp/eCAEZWmQTtpjy/YIO2n1w06Oj3cEp87eU=; b=rODrqZUrUkyhIazNlFRvLiHXCitjbqh+z7UuOi26aO6VwGEjidIoBYV8YjRyd3EBF9 X5H2OiyG2CJRPDmdFMGEXiKoGxAaIUK+owIfLxW5968XBNxDngPyAqfBPKAShj631bId +E1qHqqz9fH8IJPHt+3c7M8uoIfuD8Hc91g+7VvFejnjK0XWxqraLKTf1/X5rzkscTMc YvLSWKrz4+LraJviCUw9uvZx5xQ+7w9n83w8xCYuBgw7SNxpfGfSUrWt28MQ/6MRmwgZ JhOuK6SOCTGgD2wUK0VUM5Y/+DA/U8d3kf5xvXhUqsJS9kUnYPgX3KF7KDaBRTS0qHnt QpQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jGHPc0wsp/eCAEZWmQTtpjy/YIO2n1w06Oj3cEp87eU=; b=pBUqTCt1Qmz5u1Hph3/JVakImR80ehDsn3iP7+ahCjgViKDqVkvMMSf0rznHGa6NEO us3l0cLqIvBZ9Zt7b2+Q7YWM+mmrHcwFDEBiStrtH1w8rCnplV/ZP1p75aN/cFETZZY3 i/gU5pVVxg1psWhTL2vNXL7Ef8pM7zHxK09o3Uv68kE9rjfRFoYljSjCBqb+PDxPm9Wt rN1PsZCjCZEruerVUsVPjMJOjbi4M5DrKaOnBoBzzhOgM/PmB8mzPYrUu4V/WpjkCEcq +sFmE8O7rjmdDtOpJsSHapgOeE2tPJsTgoknyLPQ8IZAiMM9lAbf4Ip+0DlrBWYSstvv jXPw== X-Gm-Message-State: AOAM5306nnACrMv4eMwC8exF4IykT+IFFKdXYt4x8EWQhyOiI0o8WaIe vN+t50XGJGW/L+644rY1EiQ= X-Google-Smtp-Source: ABdhPJxqd9G/RTf6Y6OKZgMxdyiFuicPRBrQ3b0cegGCr5u8bhz40jsv96pCQdm34tDZw636kPC9vQ== X-Received: by 2002:a17:902:680c:b029:d3:d414:8e32 with SMTP id h12-20020a170902680cb02900d3d4148e32mr2162846plk.17.1602065601306; Wed, 07 Oct 2020 03:13:21 -0700 (PDT) Received: from localhost.localdomain ([49.207.204.22]) by smtp.gmail.com with ESMTPSA id q24sm1105291pgb.12.2020.10.07.03.13.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 03:13:20 -0700 (PDT) From: Allen Pais To: davem@davemloft.net Cc: gerrit@erg.abdn.ac.uk, kuba@kernel.org, edumazet@google.com, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, johannes@sipsolutions.net, alex.aring@gmail.com, stefan@datenfreihafen.org, santosh.shilimkar@oracle.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, steffen.klassert@secunet.com, herbert@gondor.apana.org.au, netdev@vger.kernel.org, Allen Pais , Romain Perier Subject: [net-next v2 7/8] net: smc: convert tasklets to use new tasklet_setup() API Date: Wed, 7 Oct 2020 15:42:18 +0530 Message-Id: <20201007101219.356499-8-allen.lkml@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201007101219.356499-1-allen.lkml@gmail.com> References: <20201007101219.356499-1-allen.lkml@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Allen Pais 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 Signed-off-by: Allen Pais Acked-by: Karsten Graul --- net/smc/smc_cdc.c | 6 +++--- net/smc/smc_wr.c | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/net/smc/smc_cdc.c b/net/smc/smc_cdc.c index b1ce6ccbf..f23f55805 100644 --- a/net/smc/smc_cdc.c +++ b/net/smc/smc_cdc.c @@ -389,9 +389,9 @@ static void smc_cdc_msg_recv(struct smc_sock *smc, struct smc_cdc_msg *cdc) * Context: * - tasklet context */ -static void smcd_cdc_rx_tsklet(unsigned long data) +static void smcd_cdc_rx_tsklet(struct tasklet_struct *t) { - struct smc_connection *conn = (struct smc_connection *)data; + struct smc_connection *conn = from_tasklet(conn, t, rx_tsklet); struct smcd_cdc_msg *data_cdc; struct smcd_cdc_msg cdc; struct smc_sock *smc; @@ -411,7 +411,7 @@ static void smcd_cdc_rx_tsklet(unsigned long data) */ void smcd_cdc_rx_init(struct smc_connection *conn) { - tasklet_init(&conn->rx_tsklet, smcd_cdc_rx_tsklet, (unsigned long)conn); + tasklet_setup(&conn->rx_tsklet, smcd_cdc_rx_tsklet); } /***************************** init, exit, misc ******************************/ diff --git a/net/smc/smc_wr.c b/net/smc/smc_wr.c index 1e23cdd41..cbc73a7e4 100644 --- a/net/smc/smc_wr.c +++ b/net/smc/smc_wr.c @@ -131,9 +131,9 @@ static inline void smc_wr_tx_process_cqe(struct ib_wc *wc) wake_up(&link->wr_tx_wait); } -static void smc_wr_tx_tasklet_fn(unsigned long data) +static void smc_wr_tx_tasklet_fn(struct tasklet_struct *t) { - struct smc_ib_device *dev = (struct smc_ib_device *)data; + struct smc_ib_device *dev = from_tasklet(dev, t, send_tasklet); struct ib_wc wc[SMC_WR_MAX_POLL_CQE]; int i = 0, rc; int polled = 0; @@ -435,9 +435,9 @@ static inline void smc_wr_rx_process_cqes(struct ib_wc wc[], int num) } } -static void smc_wr_rx_tasklet_fn(unsigned long data) +static void smc_wr_rx_tasklet_fn(struct tasklet_struct *t) { - struct smc_ib_device *dev = (struct smc_ib_device *)data; + struct smc_ib_device *dev = from_tasklet(dev, t, recv_tasklet); struct ib_wc wc[SMC_WR_MAX_POLL_CQE]; int polled = 0; int rc; @@ -698,10 +698,8 @@ void smc_wr_remove_dev(struct smc_ib_device *smcibdev) void smc_wr_add_dev(struct smc_ib_device *smcibdev) { - tasklet_init(&smcibdev->recv_tasklet, smc_wr_rx_tasklet_fn, - (unsigned long)smcibdev); - tasklet_init(&smcibdev->send_tasklet, smc_wr_tx_tasklet_fn, - (unsigned long)smcibdev); + tasklet_setup(&smcibdev->recv_tasklet, smc_wr_rx_tasklet_fn); + tasklet_setup(&smcibdev->send_tasklet, smc_wr_tx_tasklet_fn); } int smc_wr_create_link(struct smc_link *lnk) From patchwork Wed Oct 7 10:12:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11820327 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77A9BC4363C for ; Wed, 7 Oct 2020 10:13:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 17E1D20782 for ; Wed, 7 Oct 2020 10:13:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uSOVFrro" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728034AbgJGKN3 (ORCPT ); Wed, 7 Oct 2020 06:13:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728025AbgJGKN2 (ORCPT ); Wed, 7 Oct 2020 06:13:28 -0400 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DFB0C061755 for ; Wed, 7 Oct 2020 03:13:28 -0700 (PDT) Received: by mail-pg1-x544.google.com with SMTP id g29so1094379pgl.2 for ; Wed, 07 Oct 2020 03:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e4124ZcFqiqae4etVgXkb0JmPtNmt23EjDbzK6zJ4Ds=; b=uSOVFrro4nr1hbuBaZoDzAoLC9nwe81KWhN2vNBsg7UeSHzXy6yWG93+TY/er1rcuW PDa0nbvbsISgJhEu5CsJJW84/WwUL/xSHILrssR6EKI3kh+wpdm+qNi52lMo7INQqeXj cYOWVcj7J/liEbSKE5xiqnnPrzk9/VZNwFQcQrPEGH63PyfkE23yrXM3G4GzIv7nexIF QND1RIcqVizY2sUIP8w8w3HyrlCrLEGcpfj02Snd3npa/V0/yn2cf6ql7XdpPFA8+UrY j7jHiyDgWOgL1SuWjVo4I6860EvofOOX2VJv7QsqvsM7lC/daXpDKUyooCQY/4Bdw7c9 oLYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=e4124ZcFqiqae4etVgXkb0JmPtNmt23EjDbzK6zJ4Ds=; b=VywFXTD8IDc3bOSf0jpUsYDim9wopX2Pe1dhf4+ZiojdCyMTybhzFvzbA2Ck3HJOZP SOIAxwvrc35Rds8yyWRK4X1zDbVArJ2svKV4MVC2uSoP/Cxtr2r+3TVFJHDpNDZt+BMm ZoBfyDCkvqlqvgcPK9vvimH91BJcwaPQfvyThH4braYtpq+UvYVzZsOc0xM9tgVREwe0 ZejmUfo5vLomYZ43CxlKxzulYQmk/5UYQj7uj5dgtP5Cce87LLE6sAaJL3YQoUzwovdr DdZj9gfdcMla0/8y3Dk20cZ9JmR9+CwGBOAypwW/ZsayMz9VDqAHWFvu2+jAtsP04Q/5 Gtzw== X-Gm-Message-State: AOAM530jHGTIxXpxRD8kSye7mHnnslU79EOkDE0rb/0ejldd5/W7DBxT Dtk9Pps/JcMl9FkdKPzG39c= X-Google-Smtp-Source: ABdhPJxL4P1eSYGZgjVTaGnyQrY+Xx9rpKnFqBJhHqfO4GGNT9eZD99JvDpcYFCVKJq1haaZTppbrQ== X-Received: by 2002:aa7:9f04:0:b029:13e:d13d:a08c with SMTP id g4-20020aa79f040000b029013ed13da08cmr2299359pfr.35.1602065608115; Wed, 07 Oct 2020 03:13:28 -0700 (PDT) Received: from localhost.localdomain ([49.207.204.22]) by smtp.gmail.com with ESMTPSA id q24sm1105291pgb.12.2020.10.07.03.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 03:13:27 -0700 (PDT) From: Allen Pais To: davem@davemloft.net Cc: gerrit@erg.abdn.ac.uk, kuba@kernel.org, edumazet@google.com, kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, johannes@sipsolutions.net, alex.aring@gmail.com, stefan@datenfreihafen.org, santosh.shilimkar@oracle.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, steffen.klassert@secunet.com, herbert@gondor.apana.org.au, netdev@vger.kernel.org, Allen Pais , Romain Perier Subject: [net-next v2 8/8] net: xfrm: convert tasklets to use new tasklet_setup() API Date: Wed, 7 Oct 2020 15:42:19 +0530 Message-Id: <20201007101219.356499-9-allen.lkml@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201007101219.356499-1-allen.lkml@gmail.com> References: <20201007101219.356499-1-allen.lkml@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Allen Pais 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 Signed-off-by: Allen Pais --- net/xfrm/xfrm_input.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index 37456d022..be6351e3f 100644 --- 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); } }