Author: anevilyak Date: 2011-10-29 16:45:39 +0200 (Sat, 29 Oct 2011) New Revision: 42952 Changeset: https://dev.haiku-os.org/changeset/42952 Ticket: https://dev.haiku-os.org/ticket/3120 Modified: haiku/trunk/src/add-ons/kernel/drivers/network/3com/dev/xl/if_xl.c Log: Apply patch by Adrian Panasiuk that fixes issues with some 3com combo chipsets. Resolves #3120. Modified: haiku/trunk/src/add-ons/kernel/drivers/network/3com/dev/xl/if_xl.c =================================================================== --- haiku/trunk/src/add-ons/kernel/drivers/network/3com/dev/xl/if_xl.c 2011-10-29 14:44:13 UTC (rev 42951) +++ haiku/trunk/src/add-ons/kernel/drivers/network/3com/dev/xl/if_xl.c 2011-10-29 14:45:39 UTC (rev 42952) @@ -1206,6 +1206,9 @@ sc->xl_flags |= XL_FLAG_PHYOK; switch (did) { +#ifdef __HAIKU__ + case TC_DEVICEID_BOOMERANG_10BT_COMBO: +#endif case TC_DEVICEID_BOOMERANG_10_100BT: /* 3c905-TX */ case TC_DEVICEID_HURRICANE_575A: case TC_DEVICEID_HURRICANE_575B: @@ -1458,6 +1461,11 @@ sc->xl_xcvr &= XL_ICFG_CONNECTOR_MASK; sc->xl_xcvr >>= XL_ICFG_CONNECTOR_BITS; +#ifdef __HAIKU__ + if (did == TC_DEVICEID_BOOMERANG_10BT_COMBO) + sc->xl_xcvr = XL_XCVR_10BT; +#endif + xl_mediacheck(sc); if (sc->xl_media & XL_MEDIAOPT_MII ||