CVS commit: src/sys/arch/x68k/dev

[Tetsuya Isaki]

Module Name:    src
Committed By:   isaki
Date:           Sat Nov 28 03:10:09 UTC 2009

Modified Files:
        src/sys/arch/x68k/dev: if_ne_intio.c if_ne_neptune.c

Log Message:
Correct return value of ne_*_match().
It's attach priority, not ne2000 model.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x68k/dev/if_ne_intio.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x68k/dev/if_ne_neptune.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/arch/x68k/dev/if_ne_intio.c
diff -u src/sys/arch/x68k/dev/if_ne_intio.c:1.13 src/sys/arch/x68k/dev/if_ne_intio.c:1.14
--- src/sys/arch/x68k/dev/if_ne_intio.c:1.13	Sun Jan 18 04:48:53 2009
+++ src/sys/arch/x68k/dev/if_ne_intio.c	Sat Nov 28 03:10:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ne_intio.c,v 1.13 2009/01/18 04:48:53 isaki Exp $	*/
+/*	$NetBSD: if_ne_intio.c,v 1.14 2009/11/28 03:10:09 isaki Exp $	*/
 
 /*
  * Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_intio.c,v 1.13 2009/01/18 04:48:53 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_intio.c,v 1.14 2009/11/28 03:10:09 isaki Exp $");
 
 #include "opt_inet.h"
 #include "opt_ns.h"
@@ -136,7 +136,7 @@
 
  out:
 	bus_space_unmap(iot, ioh, NE2000_NPORTS);
-	return rv;
+	return (rv != 0) ? 1 : 0;
 }
 
 static void

Index: src/sys/arch/x68k/dev/if_ne_neptune.c
diff -u src/sys/arch/x68k/dev/if_ne_neptune.c:1.17 src/sys/arch/x68k/dev/if_ne_neptune.c:1.18
--- src/sys/arch/x68k/dev/if_ne_neptune.c:1.17	Sun Jan 18 04:48:53 2009
+++ src/sys/arch/x68k/dev/if_ne_neptune.c	Sat Nov 28 03:10:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ne_neptune.c,v 1.17 2009/01/18 04:48:53 isaki Exp $	*/
+/*	$NetBSD: if_ne_neptune.c,v 1.18 2009/11/28 03:10:09 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_neptune.c,v 1.17 2009/01/18 04:48:53 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_neptune.c,v 1.18 2009/11/28 03:10:09 isaki Exp $");
 
 #include "opt_inet.h"
 #include "opt_ns.h"
@@ -122,7 +122,7 @@
 
  out:
 	bus_space_unmap(nict, nich, NE2000_NPORTS);
-	return (rv);
+	return (rv != 0) ? 1 : 0;
 }
 
 void