summaryrefslogtreecommitdiffstats
path: root/sys/netipsec/ipsec.c
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2008-11-27 10:43:08 +0000
committerbz <bz@FreeBSD.org>2008-11-27 10:43:08 +0000
commit9ef49d8b6f56c91c360dacd78c3cab2300da33fb (patch)
treeeca4319bad999377e5c90305f8793b34edff34e8 /sys/netipsec/ipsec.c
parente10155204bb592c22e6344e9ae6ba59765382547 (diff)
downloadFreeBSD-src-9ef49d8b6f56c91c360dacd78c3cab2300da33fb.zip
FreeBSD-src-9ef49d8b6f56c91c360dacd78c3cab2300da33fb.tar.gz
Unify ipsec[46]_delete_pcbpolicy in ipsec_delete_pcbpolicy.
Ignoring different names because of macros (in6pcb, in6p_sp) and inp vs. in6p variable name both functions were entirely identical. Reviewed by: rwatson (as part of a larger changeset) MFC after: 6 weeks (*) (*) possibly need to leave a stub wrappers in 7 to keep the symbols.
Diffstat (limited to 'sys/netipsec/ipsec.c')
-rw-r--r--sys/netipsec/ipsec.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c
index c99ccca..2fd83f0 100644
--- a/sys/netipsec/ipsec.c
+++ b/sys/netipsec/ipsec.c
@@ -1216,7 +1216,7 @@ ipsec4_get_policy(inp, request, len, mp)
/* delete policy in PCB */
int
-ipsec4_delete_pcbpolicy(inp)
+ipsec_delete_pcbpolicy(inp)
struct inpcb *inp;
{
IPSEC_ASSERT(inp != NULL, ("null inp"));
@@ -1308,27 +1308,6 @@ ipsec6_get_policy(in6p, request, len, mp)
return ipsec_get_policy(pcb_sp, mp);
}
-
-int
-ipsec6_delete_pcbpolicy(in6p)
- struct in6pcb *in6p;
-{
- IPSEC_ASSERT(in6p != NULL, ("null in6p"));
-
- if (in6p->in6p_sp == NULL)
- return 0;
-
- if (in6p->in6p_sp->sp_in != NULL)
- KEY_FREESP(&in6p->in6p_sp->sp_in);
-
- if (in6p->in6p_sp->sp_out != NULL)
- KEY_FREESP(&in6p->in6p_sp->sp_out);
-
- ipsec_delpcbpolicy(in6p->in6p_sp);
- in6p->in6p_sp = NULL;
-
- return 0;
-}
#endif
/*
OpenPOWER on IntegriCloud