aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ppp/ppp_synctty.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-01-18 13:31:30 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-01-20 16:48:47 -0800
commit3b830a9c34d5897be07176ce4e6f2d75e2c8cfd7 (patch)
treec0fbc7f3ff3d7525c548911e1132c4c130111af5 /drivers/net/ppp/ppp_synctty.c
parenttty: implement write_iter (diff)
downloadlinux-dev-3b830a9c34d5897be07176ce4e6f2d75e2c8cfd7.tar.xz
linux-dev-3b830a9c34d5897be07176ce4e6f2d75e2c8cfd7.zip
tty: convert tty_ldisc_ops 'read()' function to take a kernel pointer
The tty line discipline .read() function was passed the final user pointer destination as an argument, which doesn't match the 'write()' function, and makes it very inconvenient to do a splice method for ttys. This is a conversion to use a kernel buffer instead. NOTE! It does this by passing the tty line discipline ->read() function an additional "cookie" to fill in, and an offset into the cookie data. The line discipline can fill in the cookie data with its own private information, and then the reader will repeat the read until either the cookie is cleared or it runs out of data. The only real user of this is N_HDLC, which can use this to handle big packets, even if the kernel buffer is smaller than the whole packet. Cc: Christoph Hellwig <hch@lst.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--drivers/net/ppp/ppp_synctty.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c
index 0f338752c38b..f774b7e52da4 100644
--- a/drivers/net/ppp/ppp_synctty.c
+++ b/drivers/net/ppp/ppp_synctty.c
@@ -257,7 +257,8 @@ static int ppp_sync_hangup(struct tty_struct *tty)
*/
static ssize_t
ppp_sync_read(struct tty_struct *tty, struct file *file,
- unsigned char __user *buf, size_t count)
+ unsigned char *buf, size_t count,
+ void **cookie, unsigned long offset)
{
return -EAGAIN;
}