if_xl : patch applied on FBSD-5.2.1 not present on FBSD-5.3

Valéry valery at vslash.com
Wed Feb 23 11:56:46 PST 2005


Hi,
it's a shame to see that some guys spend a lot of time
on correcting some problems with hardware which are
not applied on stable release like 5.3.
Perhaps there's some good reasons to ignore or
override previous patch, but it's clear i don't
understand them.
Well.
We are talking about :
FreeBSD		: 5.3-RELEASE
Module 		: if_xl
Hardware	: 3Com 3c920B-EMB-WMN Integrated Fast Etherlink XL
PCI-ID		: 0x9202

Trouble 	: this hardware is not supported by FBSD5.3

Files to update	: /usr/src/sys/pci/if_xlreg.h
		  /usr/src/sys/pci/if.xl.c

Patch 		:
------------------------------------------------------------------------
hal # diff -Nuar /usr/src/sys/pci/if_xlreg.h 
/usr/src/sys/pci/if_xlreg.h.orig
--- /usr/src/sys/pci/if_xlreg.h Wed Feb 23 16:14:04 2005
+++ /usr/src/sys/pci/if_xlreg.h.orig    Wed Feb 23 16:10:57 2005
@@ -680,7 +680,6 @@
  #define TC_DEVICEID_CYCLONE_10_100FX           0x905A
  #define TC_DEVICEID_TORNADO_10_100BT           0x9200
  #define TC_DEVICEID_TORNADO_10_100BT_920B      0x9201
-#define TC_DEVICEID_TORNADO_INTEGRATED_10_100BT_920B   0x9202
  #define TC_DEVICEID_HURRICANE_10_100BT_SERV    0x9800
  #define TC_DEVICEID_TORNADO_10_100BT_SERV      0x9805
  #define TC_DEVICEID_HURRICANE_SOHO100TX                0x7646

hal # diff -Nuar /usr/src/sys/pci/if_xl.c /usr/src/sys/pci/if_xl.c.orig
--- /usr/src/sys/pci/if_xl.c    Wed Feb 23 16:24:23 2005
+++ /usr/src/sys/pci/if_xl.c.orig       Wed Feb 23 16:10:12 2005
@@ -188,8 +188,6 @@
                 "3Com 3c905C-TX Fast Etherlink XL" },
         { TC_VENDORID, TC_DEVICEID_TORNADO_10_100BT_920B,
                 "3Com 3c920B-EMB Integrated Fast Etherlink XL" },
-       { TC_VENDORID, TC_DEVICEID_TORNADO_INTEGRATED_10_100BT_920B,
-               "3Com 3c920B-EMB-WMN Integrated Fast Etherlink XL" },
         { TC_VENDORID, TC_DEVICEID_HURRICANE_10_100BT_SERV,
                 "3Com 3c980 Fast Etherlink XL" },
         { TC_VENDORID, TC_DEVICEID_TORNADO_10_100BT_SERV,
@@ -1174,7 +1172,6 @@
         case TC_DEVICEID_HURRICANE_656B:        /* 3c656B */
         case TC_DEVICEID_TORNADO_656C:          /* 3c656C */
         case TC_DEVICEID_TORNADO_10_100BT_920B: /* 3c920B-EMB */
-       case TC_DEVICEID_TORNADO_INTEGRATED_10_100BT_920B:      /* 
3c920B-EMB-WMN */
                 sc->xl_media = XL_MEDIAOPT_MII;
                 sc->xl_xcvr = XL_XCVR_MII;
                 if (verbose)
@@ -1272,7 +1269,7 @@
             did == TC_DEVICEID_HURRICANE_656B)
                 sc->xl_flags |= XL_FLAG_INVERT_MII_PWR |
                     XL_FLAG_INVERT_LED_PWR;
-       if (did == TC_DEVICEID_TORNADO_10_100BT_920B || did == 
TC_DEVICEID_TORNADO_INTEGRATED_10_100BT_920B)
+       if (did == TC_DEVICEID_TORNADO_10_100BT_920B)
                 sc->xl_flags |= XL_FLAG_PHYOK;

         switch (did) {
------------------------------------------------------------------------

And the result is (yes, on my computer only) :
xl0 at pci2:8:0:   class=0x020000 card=0x81081043 chip=0x920210b7 rev=0x40 
hdr=0x00
     vendor   = '3COM Corp, Networking Division'
     device   = '3C920B-EMB-WNM Integrated Fast Ethernet Controller'
     class    = network
     subclass = ethernet

and work fine for me.
I would be happy to understand why this patch was not present on
the if_xl-5.3 release, but this is optional.
Regards,

--
v/


More information about the freebsd-hardware mailing list