summaryrefslogtreecommitdiffstats
path: root/sys/netipsec/key.c
diff options
context:
space:
mode:
authorandre <andre@FreeBSD.org>2012-10-18 13:57:24 +0000
committerandre <andre@FreeBSD.org>2012-10-18 13:57:24 +0000
commit34a9a386cb4df8844bca8e43dae20e4a15710fcc (patch)
tree822857ae1f88eb65d6756450fb5600f0644b00d1 /sys/netipsec/key.c
parentbec3d0dcde51da4b3b1a5bc9fbea92a5353a57ed (diff)
downloadFreeBSD-src-34a9a386cb4df8844bca8e43dae20e4a15710fcc.zip
FreeBSD-src-34a9a386cb4df8844bca8e43dae20e4a15710fcc.tar.gz
Mechanically remove the last stray remains of spl* calls from net*/*.
They have been Noop's for a long time now.
Diffstat (limited to 'sys/netipsec/key.c')
-rw-r--r--sys/netipsec/key.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index bda5d41..2d6443d 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -6912,16 +6912,12 @@ key_freereg(struct socket *so)
static int
key_expire(struct secasvar *sav)
{
- int s;
int satype;
struct mbuf *result = NULL, *m;
int len;
int error = -1;
struct sadb_lifetime *lt;
- /* XXX: Why do we lock ? */
- s = splnet(); /*called from softclock()*/
-
IPSEC_ASSERT (sav != NULL, ("null sav"));
IPSEC_ASSERT (sav->sah != NULL, ("null sa header"));
@@ -7023,13 +7019,11 @@ key_expire(struct secasvar *sav)
mtod(result, struct sadb_msg *)->sadb_msg_len =
PFKEY_UNIT64(result->m_pkthdr.len);
- splx(s);
return key_sendup_mbuf(NULL, result, KEY_SENDUP_REGISTERED);
fail:
if (result)
m_freem(result);
- splx(s);
return error;
}
OpenPOWER on IntegriCloud