Date: Tue, 29 Dec 2009 23:44:33 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r201241 - stable/7/sys/netipsec Message-ID: <200912292344.nBTNiX3n040621@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Tue Dec 29 23:44:32 2009 New Revision: 201241 URL: http://svn.freebsd.org/changeset/base/201241 Log: MFC r199905: Assimilate very similar input and output code paths (no real functional change). Modified: stable/7/sys/netipsec/xform_ipcomp.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/netipsec/xform_ipcomp.c ============================================================================== --- stable/7/sys/netipsec/xform_ipcomp.c Tue Dec 29 23:42:54 2009 (r201240) +++ stable/7/sys/netipsec/xform_ipcomp.c Tue Dec 29 23:44:32 2009 (r201241) @@ -249,10 +249,8 @@ ipcomp_input_cb(struct cryptop *crp) if (crp->crp_etype == EAGAIN) { KEY_FREESAV(&sav); - error = crypto_dispatch(crp); - return error; + return crypto_dispatch(crp); } - ipcompstat.ipcomps_noxform++; DPRINTF(("%s: crypto error %d\n", __func__, crp->crp_etype)); error = crp->crp_etype; @@ -486,7 +484,7 @@ ipcomp_output_cb(struct cryptop *crp) /* Check for crypto errors */ if (crp->crp_etype) { - /* Reset session ID */ + /* Reset the session ID */ if (sav->tdb_cryptoid != 0) sav->tdb_cryptoid = crp->crp_sid;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912292344.nBTNiX3n040621>