net: atm: pppoatm: use tasklet_init to initialize wakeup tasklet
Subsystems (4)
PATCH 1/2 net: atm: pppoatm: use tasklet_init to initialize wakeup tasklet
Previously a temporary tasklet structure was initialized on the stack using DECLARE_TASKLET_OLD() and then copied over and modified. Nothing else in the kernel seems to use this pattern, so let's just call tasklet_init() like everyone else.
--- net/atm/pppoatm.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
net/atm/pppoatm.c +3 -7
@@ -389,11 +389,7 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg)struct atm_backend_ppp be;struct pppoatm_vcc *pvcc;int err; -/* -* Each PPPoATM instance has its own tasklet - this is just a -* prototypical one used to initialize them -*/ - static const DECLARE_TASKLET_OLD(tasklet_proto, pppoatm_wakeup_sender); +if (copy_from_user (&be, arg,sizeof be))return -EFAULT ; if (be.encaps != PPPOATM_ENCAPS_AUTODETECT &&
@@ -415,8 +411,8 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg) pvcc->chan.ops = &pppoatm_ops; pvcc->chan.mtu = atmvcc->qos.txtp.max_sdu -PPP_HDRLEN - (be.encaps == e_vc ?0 :LLC_LEN ); - pvcc->wakeup_tasklet = tasklet_proto; - pvcc->wakeup_tasklet.data = (unsigned long ) &pvcc->chan; +tasklet_init (&pvcc->wakeup_tasklet, pppoatm_wakeup_sender, + (unsigned long )&pvcc->chan); err =ppp_register_channel (&pvcc->chan);if (err !=0 ) {kfree (pvcc);
Signature · 1 line
2.30.0
PATCH 2/2 net: atm: pppoatm: use new API for wakeup tasklet
This converts the driver to use the new tasklet API introduced in commit 12cc923f1ccc ("tasklet: Introduce new initialization API")
--- net/atm/pppoatm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
net/atm/pppoatm.c +5 -4
@@ -101,9 +101,11 @@ static inline struct pppoatm_vcc *chan_to_pvcc(const struct ppp_channel *chan)* doesn't want to be called in interrupt context, so we do it from * a tasklet */ -static void pppoatm_wakeup_sender (unsigned long arg) +static void pppoatm_wakeup_sender (struct tasklet_struct *t) { -ppp_output_wakeup ((struct ppp_channel *) arg); +struct pppoatm_vcc *pvcc =from_tasklet (pvcc, t, wakeup_tasklet); + +ppp_output_wakeup (&pvcc->chan); }static void pppoatm_release_cb (struct atm_vcc *atmvcc)
@@ -411,8 +413,7 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg) pvcc->chan.ops = &pppoatm_ops; pvcc->chan.mtu = atmvcc->qos.txtp.max_sdu -PPP_HDRLEN - (be.encaps == e_vc ?0 :LLC_LEN ); -tasklet_init (&pvcc->wakeup_tasklet, pppoatm_wakeup_sender, - (unsigned long )&pvcc->chan); +tasklet_setup (&pvcc->wakeup_tasklet, pppoatm_wakeup_sender); err =ppp_register_channel (&pvcc->chan);if (err !=0 ) {kfree (pvcc);
Signature · 1 line
2.30.0
This series was applied to netdev/net-next.git (refs/heads/master):
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
Quoted 8 lines · On Wed, 27 Jan 2021 18:32:55 +0100 you wrote:
Previously a temporary tasklet structure was initialized on the stack using
DECLARE_TASKLET_OLD()and then copied over and modified. Nothing else in the kernel seems to use this pattern, so let's just calltasklet_init()like everyone else.Signed-off-by Emil Renner Berthing <[email protected]>[...]
Here is the summary with links:
- [1/2] net: atm: pppoatm: use tasklet_init to initialize wakeup tasklet
https://git.kernel.org/netdev/net-next/c/a5b88632fc96 - [2/2] net: atm: pppoatm: use new API for wakeup tasklet https://git.kernel.org/netdev/net-next/c/a58745979cdd
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html