projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes'
[powerpc.git]
/
drivers
/
net
/
ppp_async.c
diff --git
a/drivers/net/ppp_async.c
b/drivers/net/ppp_async.c
index
400f652
..
23659fd
100644
(file)
--- a/
drivers/net/ppp_async.c
+++ b/
drivers/net/ppp_async.c
@@
-30,6
+30,7
@@
#include <linux/ppp_channel.h>
#include <linux/spinlock.h>
#include <linux/init.h>
#include <linux/ppp_channel.h>
#include <linux/spinlock.h>
#include <linux/init.h>
+#include <linux/jiffies.h>
#include <asm/uaccess.h>
#include <asm/string.h>
#include <asm/uaccess.h>
#include <asm/string.h>
@@
-189,7
+190,7
@@
ppp_asynctty_open(struct tty_struct *tty)
goto out_free;
tty->disc_data = ap;
goto out_free;
tty->disc_data = ap;
-
+ tty->receive_room = 65536;
return 0;
out_free:
return 0;
out_free:
@@
-343,12
+344,6
@@
ppp_asynctty_poll(struct tty_struct *tty, struct file *file, poll_table *wait)
return 0;
}
return 0;
}
-static int
-ppp_asynctty_room(struct tty_struct *tty)
-{
- return 65535;
-}
-
/*
* This can now be called from hard interrupt level as well
* as soft interrupt level or mainline.
/*
* This can now be called from hard interrupt level as well
* as soft interrupt level or mainline.
@@
-398,7
+393,6
@@
static struct tty_ldisc ppp_ldisc = {
.write = ppp_asynctty_write,
.ioctl = ppp_asynctty_ioctl,
.poll = ppp_asynctty_poll,
.write = ppp_asynctty_write,
.ioctl = ppp_asynctty_ioctl,
.poll = ppp_asynctty_poll,
- .receive_room = ppp_asynctty_room,
.receive_buf = ppp_asynctty_receive,
.write_wakeup = ppp_asynctty_wakeup,
};
.receive_buf = ppp_asynctty_receive,
.write_wakeup = ppp_asynctty_wakeup,
};
@@
-577,7
+571,7
@@
ppp_async_encode(struct asyncppp *ap)
* character if necessary.
*/
if (islcp || flag_time == 0
* character if necessary.
*/
if (islcp || flag_time == 0
- ||
jiffies - ap->last_xmit >= flag_time
)
+ ||
time_after_eq(jiffies, ap->last_xmit + flag_time)
)
*buf++ = PPP_FLAG;
ap->last_xmit = jiffies;
fcs = PPP_INITFCS;
*buf++ = PPP_FLAG;
ap->last_xmit = jiffies;
fcs = PPP_INITFCS;