From root@12-232-170-32.client.attbi.com  Sun Feb  3 03:52:26 2002
Return-Path: <root@12-232-170-32.client.attbi.com>
Received: from 12-232-170-32.client.attbi.com (12-232-170-32.client.attbi.com [12.232.170.32])
	by hub.freebsd.org (Postfix) with ESMTP id 23B3237B405
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  3 Feb 2002 03:52:25 -0800 (PST)
Received: (from root@localhost)
	by dhcppc7.client.attbi.com (8.11.6/8.11.6) id g139W9B00920;
	Sun, 3 Feb 2002 01:32:09 -0800 (PST)
	(envelope-from root)
Message-Id: <200202030932.g139W9B00920@dhcppc7.client.attbi.com>
Date: Sun, 3 Feb 2002 01:32:09 -0800 (PST)
From: "Karl R. Grose" <karlgrose@uclink.berkeley.edu>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Support for D-Link DFE-690TXD Cardbus PC Card missing from rl NIC driver
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         34582
>Category:       kern
>Synopsis:       Support for D-Link DFE-690TXD Cardbus PC Card missing from rl NIC driver
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    wpaul
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 03 04:00:08 PST 2002
>Closed-Date:    Fri Dec 05 20:04:51 PST 2003
>Last-Modified:  Fri Dec 05 20:04:51 PST 2003
>Originator:     
>Release:        
>Organization:
>Environment:
>Description:
After failing to find support for the D-Link DFE-690TXD 10/100 Ethernet
(Cardbus) PC Card for use under 5.0-CURRENT, I noticed that there was a
recent NetBSD problem report (PR #15100) adding support for this card.
Following the fix given there, I proceeded to modify the rl driver-related
source files and recompile my kernel. This resulted in the card being
recognized and becoming functional as a NIC in my laptop.

>How-To-Repeat:
Boot 5.0-CURRENT NEWCARD-based kernel with rl driver: D-Link DFE-690TXD
PC Card is not recognized (the vendor and device IDs are noted during bootup).

>Fix:
The following diffs show patches (derived from NetBSD PR #15100) that
worked for me to get this card going under the rl driver:

--- if_rlreg.h.orig	Fri Nov 23 06:27:33 2001
+++ if_rlreg.h	Sun Feb  3 01:02:54 2002
@@ -463,6 +463,11 @@
 #define DLINK_DEVICEID_530TXPLUS		0x1300
 
 /*
+ * D-Link DFE-690TXD device ID
+ */
+#define DLINK_DEVICEID_690TXD			0x1340
+
+/*
  * PCI low memory base and low I/O base register, and
  * other PCI registers.
  */

--- if_rl.c.orig	Thu Dec 13 21:56:35 2001
+++ if_rl.c	Sun Feb  3 00:51:12 2002
@@ -152,6 +152,8 @@
 		"Addtron Technolgy 8139 10/100BaseTX" },
 	{ DLINK_VENDORID, DLINK_DEVICEID_530TXPLUS,
 		"D-Link DFE-530TX+ 10/100BaseTX" },
+	{ DLINK_VENDORID, DLINK_DEVICEID_690TXD,
+		"D-Link DFE-690TXD 10/100BaseTX" },
 	{ 0, 0, NULL }
 };
 
@@ -962,7 +964,8 @@
 
 	if (rl_did == RT_DEVICEID_8139 || rl_did == ACCTON_DEVICEID_5030 ||
 	    rl_did == DELTA_DEVICEID_8139 || rl_did == ADDTRON_DEVICEID_8139 ||
-	    rl_did == RT_DEVICEID_8138 || rl_did == DLINK_DEVICEID_530TXPLUS)
+	    rl_did == RT_DEVICEID_8138 || rl_did == DLINK_DEVICEID_530TXPLUS ||
+	    rl_did == DLINK_DEVICEID_690TXD)
 		sc->rl_type = RL_8139;
 	else if (rl_did == RT_DEVICEID_8129)
 		sc->rl_type = RL_8129;

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->freebsd-bugs 
Responsible-Changed-By: keramida 
Responsible-Changed-When: Mon Feb 4 14:17:44 PST 2002 
Responsible-Changed-Why:  
Misfiled PR. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=34582 
Responsible-Changed-From-To: freebsd-bugs->wpaul 
Responsible-Changed-By: sheldonh 
Responsible-Changed-When: Tue Feb 5 01:38:39 PST 2002 
Responsible-Changed-Why:  
Bill, this one contains a patch. :-) 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=34582 

From: Gavin Atkinson <gavin+freebsdpr@ury.york.ac.uk>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: kern/34582: Support for D-Link DFE-690TXD Cardbus PC Card missing
 from rl NIC driver
Date: Thu, 4 Dec 2003 10:50:36 +0000 (GMT)

 This PR can now be closed.
 Fixed in src/sys/pci/if_rl.c 1.70 (MFC 1.38.2.17)
 and src/sys/pci/if_rlreg.h 1.24 (MFC 1.14.2.6)
 
 Gavin
 
State-Changed-From-To: open->closed 
State-Changed-By: sanpei 
State-Changed-When: Fri Dec 5 20:04:15 PST 2003 
State-Changed-Why:  
Fixed in src/sys/pci/if_rl.c 1.70 (MFC 1.38.2.17) 
and src/sys/pci/if_rlreg.h 1.24 (MFC 1.14.2.6) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=34582 
>Unformatted:
 Dell Latitude CPx J650GT running FreeBSD 5.0-CURRENT
 
