@@ -1289,8 +1289,7 @@ static ssize_t tun_put_user(struct tun_struct *tun,
12891289}
12901290
12911291static ssize_t tun_do_read (struct tun_struct * tun , struct tun_file * tfile ,
1292- struct kiocb * iocb , const struct iovec * iv ,
1293- ssize_t len , int noblock )
1292+ const struct iovec * iv , ssize_t len , int noblock )
12941293{
12951294 DECLARE_WAITQUEUE (wait , current );
12961295 struct sk_buff * skb ;
@@ -1353,7 +1352,7 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv,
13531352 goto out ;
13541353 }
13551354
1356- ret = tun_do_read (tun , tfile , iocb , iv , len ,
1355+ ret = tun_do_read (tun , tfile , iv , len ,
13571356 file -> f_flags & O_NONBLOCK );
13581357 ret = min_t (ssize_t , ret , len );
13591358out :
@@ -1452,7 +1451,7 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
14521451 SOL_PACKET , TUN_TX_TIMESTAMP );
14531452 goto out ;
14541453 }
1455- ret = tun_do_read (tun , tfile , iocb , m -> msg_iov , total_len ,
1454+ ret = tun_do_read (tun , tfile , m -> msg_iov , total_len ,
14561455 flags & MSG_DONTWAIT );
14571456 if (ret > total_len ) {
14581457 m -> msg_flags |= MSG_TRUNC ;
0 commit comments