Mercurial > illumos > illumos-gate
changeset 12929:a80abc0db3a2
6894617 bfe fails test05 of nicdrv
| author | Crisson Guanghao Hu <Crisson.Hu@Sun.COM> |
|---|---|
| date | Tue, 27 Jul 2010 16:58:46 +0800 |
| parents | b59c892bdcf4 |
| children | 32a41a5f8110 |
| files | usr/src/uts/common/io/bfe/bfe.c |
| diffstat | 1 files changed, 2 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/io/bfe/bfe.c Tue Jul 27 14:53:53 2010 +0800 +++ b/usr/src/uts/common/io/bfe/bfe.c Tue Jul 27 16:58:46 2010 +0800 @@ -20,8 +20,7 @@ */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. */ #include <sys/stream.h> #include <sys/strsun.h> @@ -1735,6 +1734,7 @@ case MAC_PROP_ADV_10FDX_CAP: case MAC_PROP_ADV_10HDX_CAP: case MAC_PROP_ADV_100T4_CAP: + case MAC_PROP_EN_100T4_CAP: mac_prop_info_set_perm(prh, MAC_PROP_PERM_READ); break; @@ -1757,10 +1757,6 @@ case MAC_PROP_EN_10HDX_CAP: mac_prop_info_set_default_uint8(prh, bfe->bfe_cap_10hdx); break; - - case MAC_PROP_EN_100T4_CAP: - mac_prop_info_set_default_uint8(prh, bfe->bfe_cap_100T4); - break; } } @@ -1796,11 +1792,6 @@ capp = &bfe->bfe_cap_10hdx; break; - case MAC_PROP_EN_100T4_CAP: - advp = &bfe->bfe_adv_100T4; - capp = &bfe->bfe_cap_100T4; - break; - case MAC_PROP_AUTONEG: advp = &bfe->bfe_adv_aneg; capp = &bfe->bfe_cap_aneg;