diff options
| author | andre <andre@FreeBSD.org> | 2012-10-18 13:57:24 +0000 |
|---|---|---|
| committer | andre <andre@FreeBSD.org> | 2012-10-18 13:57:24 +0000 |
| commit | 34a9a386cb4df8844bca8e43dae20e4a15710fcc (patch) | |
| tree | 822857ae1f88eb65d6756450fb5600f0644b00d1 /sys/netinet6/ip6_ipsec.c | |
| parent | bec3d0dcde51da4b3b1a5bc9fbea92a5353a57ed (diff) | |
| download | FreeBSD-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/netinet6/ip6_ipsec.c')
| -rw-r--r-- | sys/netinet6/ip6_ipsec.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/netinet6/ip6_ipsec.c b/sys/netinet6/ip6_ipsec.c index 21aafe1..b741cb1 100644 --- a/sys/netinet6/ip6_ipsec.c +++ b/sys/netinet6/ip6_ipsec.c @@ -128,9 +128,8 @@ ip6_ipsec_fwd(struct mbuf *m) struct m_tag *mtag; struct tdb_ident *tdbi; struct secpolicy *sp; - int s, error; + int error; mtag = m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL); - s = splnet(); if (mtag != NULL) { tdbi = (struct tdb_ident *)(mtag + 1); sp = ipsec_getpolicy(tdbi, IPSEC_DIR_INBOUND); @@ -139,7 +138,6 @@ ip6_ipsec_fwd(struct mbuf *m) IP_FORWARDING, &error); } if (sp == NULL) { /* NB: can happen if error */ - splx(s); /*XXX error stat???*/ DPRINTF(("%s: no SP for forwarding\n", __func__)); /*XXX*/ return 1; @@ -150,7 +148,6 @@ ip6_ipsec_fwd(struct mbuf *m) */ error = ipsec_in_reject(sp, m); KEY_FREESP(&sp); - splx(s); if (error) { V_ip6stat.ip6s_cantforward++; return 1; @@ -173,7 +170,7 @@ ip6_ipsec_input(struct mbuf *m, int nxt) struct m_tag *mtag; struct tdb_ident *tdbi; struct secpolicy *sp; - int s, error; + int error; /* * enforce IPsec policy checking if we are seeing last header. * note that we do not visit this with protocols with pcb layer @@ -189,7 +186,6 @@ ip6_ipsec_input(struct mbuf *m, int nxt) * packet is returned to the ip input queue for delivery. */ mtag = m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL); - s = splnet(); if (mtag != NULL) { tdbi = (struct tdb_ident *)(mtag + 1); sp = ipsec_getpolicy(tdbi, IPSEC_DIR_INBOUND); @@ -209,7 +205,6 @@ ip6_ipsec_input(struct mbuf *m, int nxt) DPRINTF(("%s: no SP, packet discarded\n", __func__));/*XXX*/ return 1; } - splx(s); if (error) return 1; } @@ -283,7 +278,6 @@ ip6_ipsec_output(struct mbuf **m, struct inpcb *inp, int *flags, int *error, * done: below. */ KEY_FREESP(sp), *sp = NULL; - /* XXX splx(s); */ goto done; } } |
