From 32aa019c4558a64e8942ba6ac33484525e1e5444 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Sat, 29 Oct 2011 14:45:39 +0000 Subject: [PATCH] Apply patch by Adrian Panasiuk that fixes issues with some 3com combo chipsets. Resolves #3120. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42952 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/network/3com/dev/xl/if_xl.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/add-ons/kernel/drivers/network/3com/dev/xl/if_xl.c b/src/add-ons/kernel/drivers/network/3com/dev/xl/if_xl.c index 96a414bf1d..187738bb4b 100644 --- a/src/add-ons/kernel/drivers/network/3com/dev/xl/if_xl.c +++ b/src/add-ons/kernel/drivers/network/3com/dev/xl/if_xl.c @@ -1206,6 +1206,9 @@ xl_attach(device_t dev) 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 @@ xl_attach(device_t dev) 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 ||