aboutsummaryrefslogtreecommitdiff
path: root/sys/netipsec
diff options
context:
space:
mode:
authorPawel Jakub Dawidek <pjd@FreeBSD.org>2011-11-26 23:15:28 +0000
committerPawel Jakub Dawidek <pjd@FreeBSD.org>2011-11-26 23:15:28 +0000
commit0e4fb1db4431b47e40a77dfee91d2ad09093d4ce (patch)
treeb4f599dae88044e1244c463e26e59fac4cd01126 /sys/netipsec
parent0a95a08ecbe196da7b1942bf49e5476945e6d293 (diff)
downloadsrc-0e4fb1db4431b47e40a77dfee91d2ad09093d4ce.tar.gz
src-0e4fb1db4431b47e40a77dfee91d2ad09093d4ce.zip
Eliminate 'err' variable and just use existing 'error'.
Notes
Notes: svn path=/head/; revision=228010
Diffstat (limited to 'sys/netipsec')
-rw-r--r--sys/netipsec/xform_ah.c5
-rw-r--r--sys/netipsec/xform_esp.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/netipsec/xform_ah.c b/sys/netipsec/xform_ah.c
index 80c6e803ad49..8ec838da15fa 100644
--- a/sys/netipsec/xform_ah.c
+++ b/sys/netipsec/xform_ah.c
@@ -1135,7 +1135,6 @@ ah_output_cb(struct cryptop *crp)
struct secasvar *sav;
struct mbuf *m;
caddr_t ptr;
- int err;
tc = (struct tdb_crypto *) crp->crp_opaque;
IPSEC_ASSERT(tc != NULL, ("null opaque data area!"));
@@ -1205,10 +1204,10 @@ ah_output_cb(struct cryptop *crp)
#endif
/* NB: m is reclaimed by ipsec_process_done. */
- err = ipsec_process_done(m, isr);
+ error = ipsec_process_done(m, isr);
KEY_FREESAV(&sav);
IPSECREQUEST_UNLOCK(isr);
- return err;
+ return error;
bad:
if (sav)
KEY_FREESAV(&sav);
diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c
index e5d531415db4..87929de680fc 100644
--- a/sys/netipsec/xform_esp.c
+++ b/sys/netipsec/xform_esp.c
@@ -918,7 +918,7 @@ esp_output_cb(struct cryptop *crp)
struct ipsecrequest *isr;
struct secasvar *sav;
struct mbuf *m;
- int err, error;
+ int error;
tc = (struct tdb_crypto *) crp->crp_opaque;
IPSEC_ASSERT(tc != NULL, ("null opaque data area!"));
@@ -1000,10 +1000,10 @@ esp_output_cb(struct cryptop *crp)
#endif
/* NB: m is reclaimed by ipsec_process_done. */
- err = ipsec_process_done(m, isr);
+ error = ipsec_process_done(m, isr);
KEY_FREESAV(&sav);
IPSECREQUEST_UNLOCK(isr);
- return err;
+ return error;
bad:
if (sav)
KEY_FREESAV(&sav);