From bda0e09dc4819e6f0da56bc659a507a53ce2c49e Mon Sep 17 00:00:00 2001
From: Martin Pieuchot <mpi@cvs.openbsd.org>
Date: Fri, 11 Aug 2017 21:24:21 +0000
Subject: Remove NET_LOCK()'s argument.

Tested by Hrvoje Popovski, ok bluhm@
---
 sys/net/if_pppx.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'sys/net/if_pppx.c')

diff --git a/sys/net/if_pppx.c b/sys/net/if_pppx.c
index 1bb9e45dc2f..aac69060956 100644
--- a/sys/net/if_pppx.c
+++ b/sys/net/if_pppx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pppx.c,v 1.61 2017/05/30 07:50:37 mpi Exp $ */
+/*	$OpenBSD: if_pppx.c,v 1.62 2017/08/11 21:24:19 mpi Exp $ */
 
 /*
  * Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org>
@@ -277,7 +277,6 @@ pppxread(dev_t dev, struct uio *uio, int ioflag)
 	struct pppx_dev *pxd = pppx_dev2pxd(dev);
 	struct mbuf *m, *m0;
 	int error = 0;
-	int s;
 	size_t len;
 
 	if (!pxd)
@@ -287,11 +286,11 @@ pppxread(dev_t dev, struct uio *uio, int ioflag)
 		if (ISSET(ioflag, IO_NDELAY))
 			return (EWOULDBLOCK);
 
-		NET_LOCK(s);
+		NET_LOCK();
 		pxd->pxd_waiting = 1;
 		error = rwsleep(pxd, &netlock,
 		    (PZERO + 1)|PCATCH, "pppxread", 0);
-		NET_UNLOCK(s);
+		NET_UNLOCK();
 		if (error != 0) {
 			return (error);
 		}
@@ -414,9 +413,9 @@ int
 pppxioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 {
 	struct pppx_dev *pxd = pppx_dev2pxd(dev);
-	int s, error = 0;
+	int error = 0;
 
-	NET_LOCK(s);
+	NET_LOCK();
 	switch (cmd) {
 	case PIPEXSMODE:
 		/*
@@ -466,7 +465,7 @@ pppxioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 		error = ENOTTY;
 		break;
 	}
-	NET_UNLOCK(s);
+	NET_UNLOCK();
 
 	return (error);
 }
-- 
cgit v1.2.3