|
@@ -69,7 +69,7 @@ struct asyncppp {
|
|
|
|
|
|
struct tasklet_struct tsk;
|
|
|
|
|
|
- atomic_t refcnt;
|
|
|
+ refcount_t refcnt;
|
|
|
struct semaphore dead_sem;
|
|
|
struct ppp_channel chan; /* interface to generic ppp layer */
|
|
|
unsigned char obuf[OBUFSIZE];
|
|
@@ -140,14 +140,14 @@ static struct asyncppp *ap_get(struct tty_struct *tty)
|
|
|
read_lock(&disc_data_lock);
|
|
|
ap = tty->disc_data;
|
|
|
if (ap != NULL)
|
|
|
- atomic_inc(&ap->refcnt);
|
|
|
+ refcount_inc(&ap->refcnt);
|
|
|
read_unlock(&disc_data_lock);
|
|
|
return ap;
|
|
|
}
|
|
|
|
|
|
static void ap_put(struct asyncppp *ap)
|
|
|
{
|
|
|
- if (atomic_dec_and_test(&ap->refcnt))
|
|
|
+ if (refcount_dec_and_test(&ap->refcnt))
|
|
|
up(&ap->dead_sem);
|
|
|
}
|
|
|
|
|
@@ -185,7 +185,7 @@ ppp_asynctty_open(struct tty_struct *tty)
|
|
|
skb_queue_head_init(&ap->rqueue);
|
|
|
tasklet_init(&ap->tsk, ppp_async_process, (unsigned long) ap);
|
|
|
|
|
|
- atomic_set(&ap->refcnt, 1);
|
|
|
+ refcount_set(&ap->refcnt, 1);
|
|
|
sema_init(&ap->dead_sem, 0);
|
|
|
|
|
|
ap->chan.private = ap;
|
|
@@ -234,7 +234,7 @@ ppp_asynctty_close(struct tty_struct *tty)
|
|
|
* our channel ops (i.e. ppp_async_send/ioctl) are in progress
|
|
|
* by the time it returns.
|
|
|
*/
|
|
|
- if (!atomic_dec_and_test(&ap->refcnt))
|
|
|
+ if (!refcount_dec_and_test(&ap->refcnt))
|
|
|
down(&ap->dead_sem);
|
|
|
tasklet_kill(&ap->tsk);
|
|
|
|