Module Name:    src
Committed By:   martin
Date:           Sat Apr  6 16:52:47 UTC 2013

Modified Files:
        src/sys/dev/pci: if_athn_pci.c

Log Message:
Prefer this driver over the old ath(4)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/if_athn_pci.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/pci/if_athn_pci.c
diff -u src/sys/dev/pci/if_athn_pci.c:1.6 src/sys/dev/pci/if_athn_pci.c:1.7
--- src/sys/dev/pci/if_athn_pci.c:1.6	Fri Apr  5 19:15:08 2013
+++ src/sys/dev/pci/if_athn_pci.c	Sat Apr  6 16:52:47 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_athn_pci.c,v 1.6 2013/04/05 19:15:08 martin Exp $	*/
+/*	$NetBSD: if_athn_pci.c,v 1.7 2013/04/06 16:52:47 martin Exp $	*/
 /*	$OpenBSD: if_athn_pci.c,v 1.11 2011/01/08 10:02:32 damien Exp $	*/
 
 /*-
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_athn_pci.c,v 1.6 2013/04/05 19:15:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_pci.c,v 1.7 2013/04/06 16:52:47 martin Exp $");
 
 #include "opt_inet.h"
 
@@ -115,7 +115,11 @@ athn_pci_match(device_t parent, cfdata_t
 	for (i = 0; i < __arraycount(athn_pci_devices); i++) {
 		if (PCI_VENDOR(pa->pa_id) == athn_pci_devices[i].apd_vendor &&
 		    PCI_PRODUCT(pa->pa_id) == athn_pci_devices[i].apd_product)
-			return 1;
+			/*
+			 * Match better than 1, we prefer this driver
+			 * over ath(4)
+			 */
+			return 10;
 	}
 	return 0;
 }

Reply via email to