cosmetic change for ioctl funtions.. move splnet out from variable declaration.

5 files changed, 18 insertions, 10 deletions

diff --git a/sys/arch/mac68k/dev/if_mc.c b/sys/arch/mac68k/dev/if_mc.c
index d485f35c9f4..033410c5e89 100644
--- a/sys/arch/mac68k/dev/if_mc.c
+++ b/sys/arch/mac68k/dev/if_mc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mc.c,v 1.17 2008/10/02 20:21:13 brad Exp $	*/
+/*	$OpenBSD: if_mc.c,v 1.18 2008/10/08 23:53:08 brad Exp $	*/
 /*	$NetBSD: if_mc.c,v 1.24 2004/10/30 18:08:34 thorpej Exp $	*/
 
 /*-
@@ -178,8 +178,9 @@ mcioctl(ifp, cmd, data)
 	struct mc_softc *sc = ifp->if_softc;
 	struct ifaddr *ifa;
 	struct ifreq *ifr;
+	int s, err = 0;
 
-	int	s = splnet(), err = 0;
+	s = splnet();
 
 	switch (cmd) {
 	case SIOCSIFADDR:
diff --git a/sys/arch/mac68k/dev/if_sn.c b/sys/arch/mac68k/dev/if_sn.c
index 5e2e50a15c3..97bf9bdf259 100644
--- a/sys/arch/mac68k/dev/if_sn.c
+++ b/sys/arch/mac68k/dev/if_sn.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_sn.c,v 1.48 2008/10/02 20:21:13 brad Exp $        */
+/*    $OpenBSD: if_sn.c,v 1.49 2008/10/08 23:53:08 brad Exp $        */
 /*    $NetBSD: if_sn.c,v 1.13 1997/04/25 03:40:10 briggs Exp $        */
 
 /*
@@ -254,7 +254,9 @@ snioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	struct ifaddr *ifa;
 	struct ifreq *ifr;
 	struct sn_softc *sc = ifp->if_softc;
-	int	s = splnet(), err = 0;
+	int s, err = 0;
+
+	s = splnet();
 
 	switch (cmd) {
 	case SIOCSIFADDR:
diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c
index d2c9d086989..e2a6e928655 100644
--- a/sys/arch/macppc/dev/if_mc.c
+++ b/sys/arch/macppc/dev/if_mc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mc.c,v 1.11 2008/10/02 20:21:13 brad Exp $	*/
+/*	$OpenBSD: if_mc.c,v 1.12 2008/10/08 23:53:08 brad Exp $	*/
 /*	$NetBSD: if_mc.c,v 1.9.16.1 2006/06/21 14:53:13 yamt Exp $	*/
 
 /*-
@@ -497,8 +497,9 @@ mc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	struct mc_softc *sc = ifp->if_softc;
 	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct ifreq *ifr;
+	int s, err = 0;
 
-	int s = splnet(), err = 0;
+	s = splnet();
 
 	switch (cmd) {
 	case SIOCSIFADDR:
diff --git a/sys/arch/vax/bi/if_ni.c b/sys/arch/vax/bi/if_ni.c
index fb314d17770..8fe236275df 100644
--- a/sys/arch/vax/bi/if_ni.c
+++ b/sys/arch/vax/bi/if_ni.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ni.c,v 1.11 2008/10/02 20:21:13 brad Exp $ */
+/*	$OpenBSD: if_ni.c,v 1.12 2008/10/08 23:53:08 brad Exp $ */
 /*	$NetBSD: if_ni.c,v 1.15 2002/05/22 16:03:14 wiz Exp $ */
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -697,7 +697,9 @@ niioctl(ifp, cmd, data)
 	struct ni_softc *sc = ifp->if_softc;
 	struct ifreq *ifr = (struct ifreq *)data;
 	struct ifaddr *ifa = (struct ifaddr *)data;
-	int s = splnet(), error = 0;
+	int s, error = 0;
+
+	s = splnet();
 
 	switch (cmd) {
 	case SIOCSIFADDR:
diff --git a/sys/arch/vax/if/if_qe.c b/sys/arch/vax/if/if_qe.c
index e1ac2c63350..736db37ff29 100644
--- a/sys/arch/vax/if/if_qe.c
+++ b/sys/arch/vax/if/if_qe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_qe.c,v 1.22 2008/10/02 20:21:13 brad Exp $	*/
+/*	$OpenBSD: if_qe.c,v 1.23 2008/10/08 23:53:08 brad Exp $	*/
 /*      $NetBSD: if_qe.c,v 1.51 2002/06/08 12:28:37 ragge Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -633,7 +633,9 @@ qeioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	struct qe_softc *sc = ifp->if_softc;
 	struct ifreq *ifr = (struct ifreq *)data;
 	struct ifaddr *ifa = (struct ifaddr *)data;
-	int s = splnet(), error = 0;
+	int s, error = 0;
+
+	s = splnet();
 
 	switch (cmd) {
 	case SIOCSIFADDR: