Browse Source

ppp_read(): switch to skb_copy_datagram_iter()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 10 years ago
parent
commit
ba5684083c
1 changed files with 3 additions and 1 deletions
  1. 3 1
      drivers/net/ppp/ppp_generic.c

+ 3 - 1
drivers/net/ppp/ppp_generic.c

@@ -417,6 +417,7 @@ static ssize_t ppp_read(struct file *file, char __user *buf,
 	ssize_t ret;
 	ssize_t ret;
 	struct sk_buff *skb = NULL;
 	struct sk_buff *skb = NULL;
 	struct iovec iov;
 	struct iovec iov;
+	struct iov_iter to;
 
 
 	ret = count;
 	ret = count;
 
 
@@ -462,7 +463,8 @@ static ssize_t ppp_read(struct file *file, char __user *buf,
 	ret = -EFAULT;
 	ret = -EFAULT;
 	iov.iov_base = buf;
 	iov.iov_base = buf;
 	iov.iov_len = count;
 	iov.iov_len = count;
-	if (skb_copy_datagram_iovec(skb, 0, &iov, skb->len))
+	iov_iter_init(&to, READ, &iov, 1, count);
+	if (skb_copy_datagram_iter(skb, 0, &to, skb->len))
 		goto outf;
 		goto outf;
 	ret = skb->len;
 	ret = skb->len;