Module Name: src
Committed By: mrg
Date: Sat Jul 2 13:13:23 UTC 2011
Modified Files:
src/sys/dev/ic: i82586.c
Log Message:
listen to GCC 4.5 and change "!!x | y" into "(!!x) | y".
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/ic/i82586.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/i82586.c
diff -u src/sys/dev/ic/i82586.c:1.69 src/sys/dev/ic/i82586.c:1.70
--- src/sys/dev/ic/i82586.c:1.69 Fri Jun 3 16:28:40 2011
+++ src/sys/dev/ic/i82586.c Sat Jul 2 13:13:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: i82586.c,v 1.69 2011/06/03 16:28:40 tsutsui Exp $ */
+/* $NetBSD: i82586.c,v 1.70 2011/07/02 13:13:22 mrg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -137,7 +137,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.69 2011/06/03 16:28:40 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.70 2011/07/02 13:13:22 mrg Exp $");
#include <sys/param.h>
@@ -1507,7 +1507,7 @@
*IE_CMD_CFG_IFS(buf) = 0x60;
*IE_CMD_CFG_SLOT_LOW(buf) = 0;
*IE_CMD_CFG_SLOT_HIGH(buf) = 0xf2;
- *IE_CMD_CFG_PROMISC(buf) = !!promiscuous | manchester << 2;
+ *IE_CMD_CFG_PROMISC(buf) = (!!promiscuous) | manchester << 2;
*IE_CMD_CFG_CRSCDT(buf) = 0;
*IE_CMD_CFG_MINLEN(buf) = 64;
*IE_CMD_CFG_JUNK(buf) = 0xff;
