Skip to content

Commit

Permalink
ppp: use new tasklet API
Browse files Browse the repository at this point in the history
This converts the async and synctty drivers to use the new tasklet API n
commit 12cc923 ("tasklet: Introduce new initialization API")

Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Emil Renner Berthing authored and Jakub Kicinski committed Feb 2, 2021
1 parent 0826752 commit 64ca5ab
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions drivers/net/ppp/ppp_async.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static void ppp_async_input(struct asyncppp *ap, const unsigned char *buf,
char *flags, int count);
static int ppp_async_ioctl(struct ppp_channel *chan, unsigned int cmd,
unsigned long arg);
static void ppp_async_process(unsigned long arg);
static void ppp_async_process(struct tasklet_struct *t);

static void async_lcp_peek(struct asyncppp *ap, unsigned char *data,
int len, int inbound);
Expand Down Expand Up @@ -179,7 +179,7 @@ ppp_asynctty_open(struct tty_struct *tty)
ap->lcp_fcs = -1;

skb_queue_head_init(&ap->rqueue);
tasklet_init(&ap->tsk, ppp_async_process, (unsigned long) ap);
tasklet_setup(&ap->tsk, ppp_async_process);

refcount_set(&ap->refcnt, 1);
init_completion(&ap->dead);
Expand Down Expand Up @@ -488,9 +488,9 @@ ppp_async_ioctl(struct ppp_channel *chan, unsigned int cmd, unsigned long arg)
* to the ppp_generic code, and to tell the ppp_generic code
* if we can accept more output now.
*/
static void ppp_async_process(unsigned long arg)
static void ppp_async_process(struct tasklet_struct *t)
{
struct asyncppp *ap = (struct asyncppp *) arg;
struct asyncppp *ap = from_tasklet(ap, t, tsk);
struct sk_buff *skb;

/* process received packets */
Expand Down
8 changes: 4 additions & 4 deletions drivers/net/ppp/ppp_synctty.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static struct sk_buff* ppp_sync_txmunge(struct syncppp *ap, struct sk_buff *);
static int ppp_sync_send(struct ppp_channel *chan, struct sk_buff *skb);
static int ppp_sync_ioctl(struct ppp_channel *chan, unsigned int cmd,
unsigned long arg);
static void ppp_sync_process(unsigned long arg);
static void ppp_sync_process(struct tasklet_struct *t);
static int ppp_sync_push(struct syncppp *ap);
static void ppp_sync_flush_output(struct syncppp *ap);
static void ppp_sync_input(struct syncppp *ap, const unsigned char *buf,
Expand Down Expand Up @@ -177,7 +177,7 @@ ppp_sync_open(struct tty_struct *tty)
ap->raccm = ~0U;

skb_queue_head_init(&ap->rqueue);
tasklet_init(&ap->tsk, ppp_sync_process, (unsigned long) ap);
tasklet_setup(&ap->tsk, ppp_sync_process);

refcount_set(&ap->refcnt, 1);
init_completion(&ap->dead_cmp);
Expand Down Expand Up @@ -480,9 +480,9 @@ ppp_sync_ioctl(struct ppp_channel *chan, unsigned int cmd, unsigned long arg)
* to the ppp_generic code, and to tell the ppp_generic code
* if we can accept more output now.
*/
static void ppp_sync_process(unsigned long arg)
static void ppp_sync_process(struct tasklet_struct *t)
{
struct syncppp *ap = (struct syncppp *) arg;
struct syncppp *ap = from_tasklet(ap, t, tsk);
struct sk_buff *skb;

/* process received packets */
Expand Down

0 comments on commit 64ca5ab

Please sign in to comment.