projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
768aec0
)
n_hdlc: honor O_NONBLOCK on write
author
Paul Fulghum
<
[email protected]
>
Tue, 22 Jul 2008 10:21:19 +0000
(11:21 +0100)
committer
Linus Torvalds
<
[email protected]
>
Tue, 22 Jul 2008 20:03:28 +0000
(13:03 -0700)
Make n_hdlc line discipline honor the O_NONBLOCK file flag on write.
Signed-off-by: Paul Fulghum <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Alan Cox <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/char/n_hdlc.c
patch
|
blob
|
history
diff --git
a/drivers/char/n_hdlc.c
b/drivers/char/n_hdlc.c
index ed4e03333ab4646029f61236a554daa23a65a2df..69ec6399c714b206ea11de8c30d8ba75fd0a9bd6 100644
(file)
--- a/
drivers/char/n_hdlc.c
+++ b/
drivers/char/n_hdlc.c
@@
-677,6
+677,10
@@
static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,
/* Allocate transmit buffer */
/* sleep until transmit buffer available */
while (!(tbuf = n_hdlc_buf_get(&n_hdlc->tx_free_buf_list))) {
+ if (file->f_flags & O_NONBLOCK) {
+ error = -EAGAIN;
+ break;
+ }
schedule();
n_hdlc = tty2n_hdlc (tty);