Author: jmg
Date: Tue Mar 11 01:41:09 2014
New Revision: 262993
URL: http://svnweb.freebsd.org/changeset/base/262993
Log:
some minor clean up.. Always _ZERO memory so mtx_init won't panic...
use the proper macro instead of hand rolling it...
Reviewed by: jhb (only the malloc change)
MFC after: 1 week
Modified:
head/sys/opencrypto/cryptodev.c
head/sys/opencrypto/cryptosoft.c
Modified: head/sys/opencrypto/cryptodev.c
==============================================================================
--- head/sys/opencrypto/cryptodev.c Tue Mar 11 01:10:44 2014
(r262992)
+++ head/sys/opencrypto/cryptodev.c Tue Mar 11 01:41:09 2014
(r262993)
@@ -1044,12 +1044,7 @@ csecreate(struct fcrypt *fcr, u_int64_t
{
struct csession *cse;
-#ifdef INVARIANTS
- /* NB: required when mtx_init is built with INVARIANTS */
cse = malloc(sizeof(struct csession), M_XDATA, M_NOWAIT | M_ZERO);
-#else
- cse = malloc(sizeof(struct csession), M_XDATA, M_NOWAIT);
-#endif
if (cse == NULL)
return NULL;
mtx_init(&cse->lock, "cryptodev", "crypto session lock", MTX_DEF);
Modified: head/sys/opencrypto/cryptosoft.c
==============================================================================
--- head/sys/opencrypto/cryptosoft.c Tue Mar 11 01:10:44 2014
(r262992)
+++ head/sys/opencrypto/cryptosoft.c Tue Mar 11 01:41:09 2014
(r262993)
@@ -1003,7 +1003,7 @@ swcr_process(device_t dev, struct crypto
goto done;
}
- lid = crp->crp_sid & 0xffffffff;
+ lid = CRYPTO_SESID2LID(crp->crp_sid);
rw_rlock(&swcr_sessions_lock);
if (swcr_sessions == NULL || lid >= swcr_sesnum || lid == 0 ||
swcr_sessions[lid] == NULL) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
