diff options
author | bz <bz@FreeBSD.org> | 2008-11-27 10:43:08 +0000 |
---|---|---|
committer | bz <bz@FreeBSD.org> | 2008-11-27 10:43:08 +0000 |
commit | 9ef49d8b6f56c91c360dacd78c3cab2300da33fb (patch) | |
tree | eca4319bad999377e5c90305f8793b34edff34e8 /sys/netipsec | |
parent | e10155204bb592c22e6344e9ae6ba59765382547 (diff) | |
download | FreeBSD-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')
-rw-r--r-- | sys/netipsec/ipsec.c | 23 | ||||
-rw-r--r-- | sys/netipsec/ipsec.h | 2 | ||||
-rw-r--r-- | sys/netipsec/ipsec6.h | 1 |
3 files changed, 2 insertions, 24 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 /* diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h index 3bc6bc9..9b78d4c 100644 --- a/sys/netipsec/ipsec.h +++ b/sys/netipsec/ipsec.h @@ -380,7 +380,7 @@ extern int ipsec4_set_policy __P((struct inpcb *inp, int optname, caddr_t request, size_t len, struct ucred *cred)); extern int ipsec4_get_policy __P((struct inpcb *inpcb, caddr_t request, size_t len, struct mbuf **mp)); -extern int ipsec4_delete_pcbpolicy __P((struct inpcb *)); +extern int ipsec_delete_pcbpolicy __P((struct inpcb *)); extern int ipsec4_in_reject __P((struct mbuf *, struct inpcb *)); struct secas; diff --git a/sys/netipsec/ipsec6.h b/sys/netipsec/ipsec6.h index 9b23f4e..f09ba18 100644 --- a/sys/netipsec/ipsec6.h +++ b/sys/netipsec/ipsec6.h @@ -50,7 +50,6 @@ extern int ip6_ipsec_ecn; struct inpcb; -extern int ipsec6_delete_pcbpolicy __P((struct inpcb *)); extern int ipsec6_set_policy __P((struct inpcb *inp, int optname, caddr_t request, size_t len, struct ucred *cred)); extern int ipsec6_get_policy |