git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iwl3945: use iwl_rb_status
[safe/jmp/linux-2.6]
/
drivers
/
net
/
ppp_synctty.c
diff --git
a/drivers/net/ppp_synctty.c
b/drivers/net/ppp_synctty.c
index
48ed5fd
..
1e892b7
100644
(file)
--- a/
drivers/net/ppp_synctty.c
+++ b/
drivers/net/ppp_synctty.c
@@
-333,9
+333,6
@@
ppp_synctty_ioctl(struct tty_struct *tty, struct file *file,
err = -EFAULT;
switch (cmd) {
case PPPIOCGCHAN:
err = -EFAULT;
switch (cmd) {
case PPPIOCGCHAN:
- err = -ENXIO;
- if (!ap)
- break;
err = -EFAULT;
if (put_user(ppp_channel_index(&ap->chan), p))
break;
err = -EFAULT;
if (put_user(ppp_channel_index(&ap->chan), p))
break;
@@
-343,9
+340,6
@@
ppp_synctty_ioctl(struct tty_struct *tty, struct file *file,
break;
case PPPIOCGUNIT:
break;
case PPPIOCGUNIT:
- err = -ENXIO;
- if (!ap)
- break;
err = -EFAULT;
if (put_user(ppp_unit_number(&ap->chan), p))
break;
err = -EFAULT;
if (put_user(ppp_unit_number(&ap->chan), p))
break;
@@
-401,9
+395,7
@@
ppp_sync_receive(struct tty_struct *tty, const unsigned char *buf,
if (!skb_queue_empty(&ap->rqueue))
tasklet_schedule(&ap->tsk);
sp_put(ap);
if (!skb_queue_empty(&ap->rqueue))
tasklet_schedule(&ap->tsk);
sp_put(ap);
- if (test_and_clear_bit(TTY_THROTTLED, &tty->flags)
- && tty->ops->unthrottle)
- tty->ops->unthrottle(tty);
+ tty_unthrottle(tty);
}
static void
}
static void
@@
-420,7
+412,7
@@
ppp_sync_wakeup(struct tty_struct *tty)
}
}
-static struct tty_ldisc ppp_sync_ldisc = {
+static struct tty_ldisc
_ops
ppp_sync_ldisc = {
.owner = THIS_MODULE,
.magic = TTY_LDISC_MAGIC,
.name = "pppsync",
.owner = THIS_MODULE,
.magic = TTY_LDISC_MAGIC,
.name = "pppsync",