From f0a4660bee5a0e819f6039a68e156e23f8c3aa33 Mon Sep 17 00:00:00 2001 From: enami Date: Sat, 18 Oct 1997 10:56:28 +0000 Subject: [PATCH] Pull down changes from branch which is commited to by mistake... > revision 1.1.2.6 > date: 1997/10/18 10:50:21; author: enami; state: Exp; lines: +2 -2 > In the macro ne2000_match(), use its argument `fct' instead of > using pa->pf->number directly. --- sys/dev/pcmcia/if_ne_pcmcia.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c index 981930d428d5..441fa02cd260 100644 --- a/sys/dev/pcmcia/if_ne_pcmcia.c +++ b/sys/dev/pcmcia/if_ne_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ne_pcmcia.c,v 1.2 1997/10/16 23:27:26 thorpej Exp $ */ +/* $NetBSD: if_ne_pcmcia.c,v 1.3 1997/10/18 10:56:28 enami Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -218,7 +218,7 @@ struct ne2000dev { ((ne2000devs[(n)].cis1_info0) && (ne2000devs[(n)].cis1_info1) && \ (strcmp((card)->cis1_info[0], ne2000devs[(n)].cis1_info0) == 0) && \ (strcmp((card)->cis1_info[1], ne2000devs[(n)].cis1_info1) == 0))) && \ - (pa->pf->number == ne2000devs[(n)].function))? \ + ((fct) == ne2000devs[(n)].function))? \ &ne2000devs[(n)]:NULL) int