34c34
< __FBSDID("$FreeBSD: head/sys/dev/tl/if_tl.c 213894 2010-10-15 15:00:30Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/tl/if_tl.c 214264 2010-10-24 12:51:02Z marius $");
1107d1106
< int i;
1112c1111
< int unit, error = 0, rid;
---
> int error, flags, i, rid, unit;
1210,1211c1209
< sc->tl_dinfo = t;
< if (t->tl_vid == COMPAQ_VENDORID || t->tl_vid == TI_VENDORID)
---
> if (vid == COMPAQ_VENDORID || vid == TI_VENDORID)
1213c1211
< if (t->tl_vid == OLICOM_VENDORID)
---
> if (vid == OLICOM_VENDORID)
1244c1242
< if (sc->tl_dinfo->tl_vid == OLICOM_VENDORID) {
---
> if (vid == OLICOM_VENDORID) {
1281a1280,1293
> flags = 0;
> if (vid == COMPAQ_VENDORID) {
> if (did == COMPAQ_DEVICEID_NETEL_10_100_PROLIANT ||
> did == COMPAQ_DEVICEID_NETFLEX_3P_INTEGRATED ||
> did == COMPAQ_DEVICEID_NETFLEX_3P_BNC ||
> did == COMPAQ_DEVICEID_NETEL_10_T2_UTP_COAX)
> flags |= MIIF_MACPRIV0;
> if (did == COMPAQ_DEVICEID_NETEL_10 ||
> did == COMPAQ_DEVICEID_NETEL_10_100_DUAL ||
> did == COMPAQ_DEVICEID_NETFLEX_3P ||
> did == COMPAQ_DEVICEID_NETEL_10_100_EMBEDDED)
> flags |= MIIF_MACPRIV1;
> } else if (vid == OLICOM_VENDORID && did == OLICOM_DEVICEID_OC2183)
> flags |= MIIF_MACPRIV0 | MIIF_MACPRIV1;