Workaround PR/35531 by preventing iee(4) from matching the 82596DX/SX

chip variant and adding ie(4) to the kernel to match it - ie(4) works.
This commit is contained in:
skrll 2007-02-01 21:09:42 +00:00
parent 7b011b26ee
commit 52ca267ebe
2 changed files with 6 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.72 2006/11/11 18:47:09 jmmv Exp $
# $NetBSD: GENERIC,v 1.73 2007/02/01 21:09:42 skrll Exp $
#
# GENERIC machine description file
#
@ -23,7 +23,7 @@ include "arch/hp700/conf/std.hp700"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
#ident "GENERIC-$Revision: 1.72 $"
#ident "GENERIC-$Revision: 1.73 $"
maxusers 32 # estimated number of users
@ -434,7 +434,7 @@ uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown
# GSC network interfaces
#medusa* at gsc? # FDDI
#ie* at gsc? # old 82C5[89]6 Ethernet, use iee(4)
ie* at gsc? # old 82C5[89]6 Ethernet, use iee(4)
iee* at gsc? # 82C596 Ethernet
# PCI network interfaces

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_iee_gsc.c,v 1.2 2005/12/11 12:17:24 christos Exp $ */
/* $NetBSD: if_iee_gsc.c,v 1.3 2007/02/01 21:09:42 skrll Exp $ */
/*
* Copyright (c) 2003 Jochen Kunz.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_iee_gsc.c,v 1.2 2005/12/11 12:17:24 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_iee_gsc.c,v 1.3 2007/02/01 21:09:42 skrll Exp $");
/* autoconfig and device stuff */
#include <sys/param.h>
@ -204,8 +204,7 @@ iee_gsc_match(struct device *parent, struct cfdata *match, void *aux)
struct gsc_attach_args *ga = aux;
if (ga->ga_type.iodc_type == HPPA_TYPE_FIO
&& (ga->ga_type.iodc_sv_model == HPPA_FIO_LAN
|| ga->ga_type.iodc_sv_model == HPPA_FIO_GLAN))
&& ga->ga_type.iodc_sv_model == HPPA_FIO_GLAN)
/* beat old ie(4) i82586 driver */
return(10);
return(0);