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
aa6540b
..
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>
@@
-570,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;