diff options
| author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
| commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
| tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/opencrypto/cryptodev.c | |
| parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
| download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz | |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/opencrypto/cryptodev.c')
| -rw-r--r-- | sys/opencrypto/cryptodev.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c index 8b51d69..1b8a338 100644 --- a/sys/opencrypto/cryptodev.c +++ b/sys/opencrypto/cryptodev.c @@ -228,7 +228,7 @@ cryptof_ioctl( } MALLOC(crie.cri_key, u_int8_t *, - crie.cri_klen / 8, M_XDATA, M_WAITOK); + crie.cri_klen / 8, M_XDATA, 0); if ((error = copyin(sop->key, crie.cri_key, crie.cri_klen / 8))) goto bail; @@ -246,7 +246,7 @@ cryptof_ioctl( if (cria.cri_klen) { MALLOC(cria.cri_key, u_int8_t *, - cria.cri_klen / 8, M_XDATA, M_WAITOK); + cria.cri_klen / 8, M_XDATA, 0); if ((error = copyin(sop->mackey, cria.cri_key, cria.cri_klen / 8))) goto bail; @@ -332,7 +332,7 @@ cryptodev_op( cse->uio.uio_iov = cse->iovec; bzero(&cse->iovec, sizeof(cse->iovec)); cse->uio.uio_iov[0].iov_len = cop->len; - cse->uio.uio_iov[0].iov_base = malloc(cop->len, M_XDATA, M_WAITOK); + cse->uio.uio_iov[0].iov_base = malloc(cop->len, M_XDATA, 0); for (i = 0; i < cse->uio.uio_iovcnt; i++) cse->uio.uio_resid += cse->uio.uio_iov[0].iov_len; @@ -512,7 +512,7 @@ cryptodev_key(struct crypt_kop *kop) return (EINVAL); } - krp = (struct cryptkop *)malloc(sizeof *krp, M_XDATA, M_WAITOK); + krp = (struct cryptkop *)malloc(sizeof *krp, M_XDATA, 0); if (!krp) return (ENOMEM); bzero(krp, sizeof *krp); @@ -529,7 +529,7 @@ cryptodev_key(struct crypt_kop *kop) size = (krp->krp_param[i].crp_nbits + 7) / 8; if (size == 0) continue; - MALLOC(krp->krp_param[i].crp_p, caddr_t, size, M_XDATA, M_WAITOK); + MALLOC(krp->krp_param[i].crp_p, caddr_t, size, M_XDATA, 0); if (i >= krp->krp_iparams) continue; error = copyin(kop->crk_param[i].crp_p, krp->krp_param[i].crp_p, size); @@ -719,7 +719,7 @@ cryptoioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) switch (cmd) { case CRIOGET: MALLOC(fcr, struct fcrypt *, - sizeof(struct fcrypt), M_XDATA, M_WAITOK); + sizeof(struct fcrypt), M_XDATA, 0); TAILQ_INIT(&fcr->csessions); fcr->sesn = 0; |
