diff options
Diffstat (limited to 'sys/netipsec/keysock.c')
| -rw-r--r-- | sys/netipsec/keysock.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index bb7cb00a910e..1c79421bb9fb 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -67,22 +67,25 @@ #include <machine/stdarg.h> -#ifdef VIMAGE_GLOBALS -static struct key_cb key_cb; -struct pfkeystat pfkeystat; -#endif +struct key_cb { + int key_count; + int any_count; +}; +static VNET_DEFINE(struct key_cb, key_cb); +#define V_key_cb VNET_GET(key_cb) -static struct sockaddr key_src = { 2, PF_KEY }; +static struct sockaddr key_src = { 2, PF_KEY, }; static int key_sendup0 __P((struct rawcb *, struct mbuf *, int)); +VNET_DEFINE(struct pfkeystat, pfkeystat); + /* * key_output() */ int key_output(struct mbuf *m, struct socket *so) { - INIT_VNET_IPSEC(curvnet); struct sadb_msg *msg; int len, error = 0; @@ -136,7 +139,6 @@ key_sendup0(rp, m, promisc) struct mbuf *m; int promisc; { - INIT_VNET_IPSEC(curvnet); int error; if (promisc) { @@ -181,7 +183,6 @@ key_sendup(so, msg, len, target) u_int len; int target; /*target of the resulting message*/ { - INIT_VNET_IPSEC(curvnet); struct mbuf *m, *n, *mprev; int tlen; @@ -270,8 +271,6 @@ key_sendup_mbuf(so, m, target) struct mbuf *m; int target; { - INIT_VNET_NET(curvnet); - INIT_VNET_IPSEC(curvnet); struct mbuf *n; struct keycb *kp; int sendup; @@ -389,7 +388,6 @@ key_abort(struct socket *so) static int key_attach(struct socket *so, int proto, struct thread *td) { - INIT_VNET_IPSEC(curvnet); struct keycb *kp; int error; @@ -464,7 +462,6 @@ key_connect(struct socket *so, struct sockaddr *nam, struct thread *td) static void key_detach(struct socket *so) { - INIT_VNET_IPSEC(curvnet); struct keycb *kp = (struct keycb *)sotorawcb(so); KASSERT(kp != NULL, ("key_detach: kp == NULL")); @@ -567,10 +564,8 @@ struct protosw keysw[] = { static void key_init0(void) { - INIT_VNET_IPSEC(curvnet); bzero((caddr_t)&V_key_cb, sizeof(V_key_cb)); - ipsec_init(); key_init(); } |