Module Name:    src
Committed By:   mbalmer
Date:           Sat Apr  2 08:11:33 UTC 2011

Modified Files:
        src/sys/dev/ic: atw.c
        src/sys/dev/pci: if_vte.c if_wpi.c
        src/sys/dev/scsipi: if_se.c
        src/sys/kern: kern_module.c subr_autoconf.c
        src/sys/net: if_ppp.c
        src/sys/net80211: ieee80211_ioctl.c

Log Message:
Fix misplaced parenthesis.  From henning.peter...@t-online.de, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/sys/dev/ic/atw.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/if_vte.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/if_wpi.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/scsipi/if_se.c
cvs rdiff -u -r1.76 -r1.77 src/sys/kern/kern_module.c
cvs rdiff -u -r1.213 -r1.214 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.132 -r1.133 src/sys/net/if_ppp.c
cvs rdiff -u -r1.54 -r1.55 src/sys/net80211/ieee80211_ioctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/ic/atw.c
diff -u src/sys/dev/ic/atw.c:1.152 src/sys/dev/ic/atw.c:1.153
--- src/sys/dev/ic/atw.c:1.152	Sat Nov 13 08:54:23 2010
+++ src/sys/dev/ic/atw.c	Sat Apr  2 08:11:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: atw.c,v 1.152 2010/11/13 08:54:23 uebayasi Exp $  */
+/*	$NetBSD: atw.c,v 1.153 2011/04/02 08:11:32 mbalmer Exp $  */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.152 2010/11/13 08:54:23 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.153 2011/04/02 08:11:32 mbalmer Exp $");
 
 
 #include <sys/param.h>
@@ -3890,7 +3890,7 @@
 			if ((error = kauth_authorize_network(curlwp->l_cred,
 			    KAUTH_NETWORK_INTERFACE,
 			    KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp,
-			    (void *)cmd, NULL) != 0))
+			    (void *)cmd, NULL)) != 0)
 				break;
 			if (!(IEEE80211_FRAG_MIN <= ireq->i_val &&
 			      ireq->i_val <= IEEE80211_FRAG_MAX))

Index: src/sys/dev/pci/if_vte.c
diff -u src/sys/dev/pci/if_vte.c:1.1 src/sys/dev/pci/if_vte.c:1.2
--- src/sys/dev/pci/if_vte.c:1.1	Wed Jan 26 18:48:13 2011
+++ src/sys/dev/pci/if_vte.c	Sat Apr  2 08:11:31 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vte.c,v 1.1 2011/01/26 18:48:13 bouyer Exp $	*/
+/*	$NetBSD: if_vte.c,v 1.2 2011/04/02 08:11:31 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 2011 Manuel Bouyer.  All rights reserved.
@@ -55,7 +55,7 @@
 /* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.1 2011/01/26 18:48:13 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.2 2011/04/02 08:11:31 mbalmer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -216,7 +216,7 @@
 	/* Reset the ethernet controller. */
 	vte_reset(sc);
 
-	if ((error = vte_dma_alloc(sc) != 0))
+	if ((error = vte_dma_alloc(sc)) != 0)
 		return;
 
 	/* Load station address. */

Index: src/sys/dev/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.48 src/sys/dev/pci/if_wpi.c:1.49
--- src/sys/dev/pci/if_wpi.c:1.48	Mon Nov 15 05:57:39 2010
+++ src/sys/dev/pci/if_wpi.c	Sat Apr  2 08:11:31 2011
@@ -1,4 +1,4 @@
-/*  $NetBSD: if_wpi.c,v 1.48 2010/11/15 05:57:39 uebayasi Exp $    */
+/*  $NetBSD: if_wpi.c,v 1.49 2011/04/02 08:11:31 mbalmer Exp $    */
 
 /*-
  * Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.48 2010/11/15 05:57:39 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.49 2011/04/02 08:11:31 mbalmer Exp $");
 
 /*
  * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -1147,7 +1147,7 @@
 	}
 
 	/* load firmware image from disk */
-	if ((error = firmware_open("if_wpi","iwlwifi-3945.ucode", &fw) != 0)) {
+	if ((error = firmware_open("if_wpi","iwlwifi-3945.ucode", &fw)) != 0) {
 		aprint_error_dev(sc->sc_dev, "could not read firmware file\n");
 		goto fail1;
 	}

Index: src/sys/dev/scsipi/if_se.c
diff -u src/sys/dev/scsipi/if_se.c:1.82 src/sys/dev/scsipi/if_se.c:1.83
--- src/sys/dev/scsipi/if_se.c:1.82	Tue Jul 27 14:04:55 2010
+++ src/sys/dev/scsipi/if_se.c	Sat Apr  2 08:11:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_se.c,v 1.82 2010/07/27 14:04:55 jakllsch Exp $	*/
+/*	$NetBSD: if_se.c,v 1.83 2011/04/02 08:11:32 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 1997 Ian W. Dall <ian.d...@dsto.defence.gov.au>
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.82 2010/07/27 14:04:55 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.83 2011/04/02 08:11:32 mbalmer Exp $");
 
 #include "opt_inet.h"
 #include "opt_atalk.h"
@@ -946,7 +946,7 @@
 			break;
 		ifp->if_flags |= IFF_UP;
 
-		if ((error = se_set_media(sc, CMEDIA_AUTOSENSE) != 0))
+		if ((error = se_set_media(sc, CMEDIA_AUTOSENSE)) != 0)
 			break;
 
 		switch (ifa->ifa_addr->sa_family) {

Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.76 src/sys/kern/kern_module.c:1.77
--- src/sys/kern/kern_module.c:1.76	Mon Feb 21 09:53:06 2011
+++ src/sys/kern/kern_module.c	Sat Apr  2 08:11:31 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_module.c,v 1.76 2011/02/21 09:53:06 pooka Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.77 2011/04/02 08:11:31 mbalmer Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.76 2011/02/21 09:53:06 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.77 2011/04/02 08:11:31 mbalmer Exp $");
 
 #define _MODULE_INTERNAL
 
@@ -351,7 +351,7 @@
 	    module_listener_cb, NULL);
 
 	__link_set_foreach(mip, modules) {
-		if ((rv = module_builtin_add(mip, 1, false) != 0))
+		if ((rv = module_builtin_add(mip, 1, false)) != 0)
 			module_error("builtin %s failed: %d\n",
 			    (*mip)->mi_name, rv);
 	}

Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.213 src/sys/kern/subr_autoconf.c:1.214
--- src/sys/kern/subr_autoconf.c:1.213	Sun Feb  6 23:25:17 2011
+++ src/sys/kern/subr_autoconf.c	Sat Apr  2 08:11:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.213 2011/02/06 23:25:17 jmcneill Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.214 2011/04/02 08:11:31 mbalmer Exp $ */
 
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.213 2011/02/06 23:25:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.214 2011/04/02 08:11:31 mbalmer Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -275,7 +275,7 @@
 	for (cfai = &cfattachv[0]; cfai->cfai_name != NULL; cfai++) {
 		for (j = 0; cfai->cfai_list[j] != NULL; j++) {
 			if ((error = att_do(cfai->cfai_name,
-			    cfai->cfai_list[j]) != 0)) {
+			    cfai->cfai_list[j])) != 0) {
 				pr("configure: attachment `%s' "
 				    "of `%s' driver %s failed: %d",
 				    cfai->cfai_list[j]->ca_name,

Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.132 src/sys/net/if_ppp.c:1.133
--- src/sys/net/if_ppp.c:1.132	Sat Aug 21 13:19:40 2010
+++ src/sys/net/if_ppp.c	Sat Apr  2 08:11:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ppp.c,v 1.132 2010/08/21 13:19:40 pgoyette Exp $	*/
+/*	$NetBSD: if_ppp.c,v 1.133 2011/04/02 08:11:32 mbalmer Exp $	*/
 /*	Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp 	*/
 
 /*
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.132 2010/08/21 13:19:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.133 2011/04/02 08:11:32 mbalmer Exp $");
 
 #include "ppp.h"
 
@@ -838,7 +838,7 @@
     case SIOCSIFMTU:
 	if ((error = kauth_authorize_network(l->l_cred,
 	    KAUTH_NETWORK_INTERFACE, KAUTH_REQ_NETWORK_INTERFACE_SETPRIV,
-	    ifp, (void *)cmd, NULL) != 0))
+	    ifp, (void *)cmd, NULL)) != 0)
 	    break;
 	/*FALLTHROUGH*/
     default:

Index: src/sys/net80211/ieee80211_ioctl.c
diff -u src/sys/net80211/ieee80211_ioctl.c:1.54 src/sys/net80211/ieee80211_ioctl.c:1.55
--- src/sys/net80211/ieee80211_ioctl.c:1.54	Sat Apr 18 14:58:05 2009
+++ src/sys/net80211/ieee80211_ioctl.c	Sat Apr  2 08:11:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ieee80211_ioctl.c,v 1.54 2009/04/18 14:58:05 tsutsui Exp $	*/
+/*	$NetBSD: ieee80211_ioctl.c,v 1.55 2011/04/02 08:11:32 mbalmer Exp $	*/
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.35 2005/08/30 14:27:47 avatar Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.54 2009/04/18 14:58:05 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.55 2011/04/02 08:11:32 mbalmer Exp $");
 #endif
 
 /*
@@ -2615,7 +2615,7 @@
 		if ((error = kauth_authorize_network(curlwp->l_cred,
 		    KAUTH_NETWORK_INTERFACE,
 		    KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, (void *)cmd,
-		    NULL) != 0))
+		    NULL)) != 0)
 			break;
 		error = ieee80211_ioctl_set80211(ic, cmd,
 				(struct ieee80211req *) data);

Reply via email to