From takawata@shidahara1.planet.sci.kobe-u.ac.jp  Tue Feb 22 19:30:45 2000
Return-Path: <takawata@shidahara1.planet.sci.kobe-u.ac.jp>
Received: from shidahara1.planet.sci.kobe-u.ac.jp (shidahara1.planet.sci.kobe-u.ac.jp [133.30.50.200])
	by hub.freebsd.org (Postfix) with ESMTP id 5DCA237B87E
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Feb 2000 19:30:42 -0800 (PST)
	(envelope-from takawata@shidahara1.planet.sci.kobe-u.ac.jp)
Received: from libr.scitec.kobe-u.ac.jp (cs22433.ppp.infoweb.ne.jp [202.219.171.145])
	by shidahara1.planet.sci.kobe-u.ac.jp (8.8.8+2.7Wbeta7/8.8.8) with ESMTP id MAA15126
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 Feb 2000 12:29:59 +0900 (JST)
Received: (from takawata@localhost) by libr.scitec.kobe-u.ac.jp (8.9.1/3.5Wpl7) id MAA00964; Wed, 23 Feb 2000 12:08:38 +0900 (JST)
Message-Id: <200002230308.MAA00964@libr.scitec.kobe-u.ac.jp>
Date: Wed, 23 Feb 2000 12:08:38 +0900 (JST)
From: Takanori Watanabe <takawata@shidahara1.planet.sci.kobe-u.ac.jp>
Reply-To: takawata@shidahara1.planet.sci.kobe-u.ac.jp
To: FreeBSD-gnats-submit@freebsd.org
Subject: Linksys-like Card Problem
X-Send-Pr-Version: 3.2

>Number:         16922
>Category:       kern
>Synopsis:       Yet another Linksys-like Card exists
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    imp
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 22 19:40:00 PST 2000
>Closed-Date:    Mon Mar 13 03:03:36 MST 2000
>Last-Modified:  Mon Mar 13 03:04:25 MST 2000
>Originator:     Takanori Watanabe
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:

FreeBSD 4.0-CURRENT around 2000 2/20 

>Description:
"PCET/TX" produced by IO DATA Corp. is yet another Linksys-Like Card with 
different MAC Vendor ID.
	

>How-To-Repeat:
Add

card "IO DATA" "PCETTX"
	config 0x20 "ed0" ?
	insert echo "PCET/TX Insert"
	remove echo "PCET/TX Removed"

to /etc/pccard.conf then restart pccardd(8)

>Fix:
Two possible fix available

--- /home/takawata/src/sys/dev/ed/if_ed.c	Sat Dec 11 17:06:22 1999
+++ /sys/dev/ed/if_ed.c	Tue Feb 22 20:24:37 2000
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.173 1999/12/10 07:22:52 imp Exp $
+ * $FreeBSD: /ctm/FreeBSD/anoncvs/cvs/src/sys/dev/ed/if_ed.c,v 1.173 1999/12/10 07:22:52 imp Exp $
  */
 
 /*
@@ -901,6 +901,7 @@
 {
 	u_char LinksysOUI1[] = {0x00, 0xe0, 0x98};
 	u_char LinksysOUI2[] = {0x00, 0x80, 0xc8};
+	u_char LinksysOUI3[] = {0x00, 0xa0, 0xb0};
 	u_char sum;
 	int i;
 
@@ -919,7 +920,8 @@
 		sc->arpcom.ac_enaddr[i] = inb(sc->asic_addr + 0x04 + i);
 	}
 	if (bcmp(sc->arpcom.ac_enaddr, LinksysOUI1, sizeof(LinksysOUI1)) &&
-	    bcmp(sc->arpcom.ac_enaddr, LinksysOUI2, sizeof(LinksysOUI2)))
+	    bcmp(sc->arpcom.ac_enaddr, LinksysOUI2, sizeof(LinksysOUI2)) &&
+	    bcmp(sc->arpcom.ac_enaddr, LinksysOUI3, sizeof(LinksysOUI3)))
 		return (0);
 	return (1);
 }
	
Or,

--- /home/takawata/src/sys/dev/ed/if_ed.c	Sat Dec 11 17:06:22 1999
+++ if_ed.c	Wed Feb 23 03:59:38 2000
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.173 1999/12/10 07:22:52 imp Exp $
+ * $FreeBSD: /ctm/FreeBSD/anoncvs/cvs/src/sys/dev/ed/if_ed.c,v 1.173 1999/12/10 07:22:52 imp Exp $
  */
 
 /*
@@ -899,8 +899,6 @@
 ed_get_Linksys(sc)
 	struct ed_softc *sc;
 {
-	u_char LinksysOUI1[] = {0x00, 0xe0, 0x98};
-	u_char LinksysOUI2[] = {0x00, 0x80, 0xc8};
 	u_char sum;
 	int i;
 
@@ -915,12 +913,6 @@
 		sum += inb(sc->asic_addr + i);
 	if (sum != 0xff)
 		return (0);		/* invalid DL10019C */
-	for (i = 0; i < ETHER_ADDR_LEN; i++) {
-		sc->arpcom.ac_enaddr[i] = inb(sc->asic_addr + 0x04 + i);
-	}
-	if (bcmp(sc->arpcom.ac_enaddr, LinksysOUI1, sizeof(LinksysOUI1)) &&
-	    bcmp(sc->arpcom.ac_enaddr, LinksysOUI2, sizeof(LinksysOUI2)))
-		return (0);
 	return (1);
 }
 







>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->imp 
Responsible-Changed-By: imp 
Responsible-Changed-When: Mon Mar 13 02:37:05 MST 2000 
Responsible-Changed-Why:  
I'll make sure this gets in. 
State-Changed-From-To: open->closed 
State-Changed-By: imp 
State-Changed-When: Mon Mar 13 03:03:36 MST 2000 
State-Changed-Why:  
Committed changes. 
>Unformatted:
