summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorclaudio <claudio@openbsd.org>2012-03-28 19:39:33 +0000
committerclaudio <claudio@openbsd.org>2012-03-28 19:39:33 +0000
commit2c9fd8325df6268554aad313b7b65f1c6fa5b301 (patch)
treec0ab4dce8e295fe7bbe21ab6cdb8229925ce19f4
parentUse p_p->ps_pid as pid in the route header instead of the thread pid. Give (diff)
downloadwireguard-openbsd-2c9fd8325df6268554aad313b7b65f1c6fa5b301.tar.xz
wireguard-openbsd-2c9fd8325df6268554aad313b7b65f1c6fa5b301.zip
More p_pid to p_p->ps_pid updates. OK deraadt@, guenther@
-rw-r--r--sys/net/if_ppp.c4
-rw-r--r--sys/net/ppp_tty.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index ae9eb6cf6bf..e835549f2ed 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ppp.c,v 1.64 2012/01/20 23:36:53 bluhm Exp $ */
+/* $OpenBSD: if_ppp.c,v 1.65 2012/03/28 19:39:33 claudio Exp $ */
/* $NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $ */
/*
@@ -463,7 +463,7 @@ pppioctl(struct ppp_softc *sc, u_long cmd, caddr_t data, int flag,
case PPPIOCXFERUNIT:
if ((error = suser(p, 0)) != 0)
return (error);
- sc->sc_xfer = p->p_pid;
+ sc->sc_xfer = p->p_p->ps_pid;
break;
#ifdef PPP_COMPRESS
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index 039f7f36eb0..8d74b22dab2 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppp_tty.c,v 1.24 2012/01/11 16:22:33 dhill Exp $ */
+/* $OpenBSD: ppp_tty.c,v 1.25 2012/03/28 19:39:33 claudio Exp $ */
/* $NetBSD: ppp_tty.c,v 1.12 1997/03/24 21:23:10 christos Exp $ */
/*
@@ -198,7 +198,7 @@ pppopen(dev_t dev, struct tty *tp)
}
}
- if ((sc = pppalloc(p->p_pid)) == NULL) {
+ if ((sc = pppalloc(p->p_p->ps_pid)) == NULL) {
splx(s);
return ENXIO;
}