summaryrefslogtreecommitdiffstats
path: root/sys/netipsec
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2011-11-26 23:15:28 +0000
committerpjd <pjd@FreeBSD.org>2011-11-26 23:15:28 +0000
commit14f91c0b66b37b78303e97fecbc42f52f126b8c5 (patch)
treeb4f599dae88044e1244c463e26e59fac4cd01126 /sys/netipsec
parent06a6aab6ccfd5939b66f905fab8e9817a12625bc (diff)
downloadFreeBSD-src-14f91c0b66b37b78303e97fecbc42f52f126b8c5.zip
FreeBSD-src-14f91c0b66b37b78303e97fecbc42f52f126b8c5.tar.gz
Eliminate 'err' variable and just use existing 'error'.
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 80c6e80..8ec838d 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 e5d5314..87929de 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);
OpenPOWER on IntegriCloud