aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavem <davem>2001-11-29 06:38:57 +0000
committerdavem <davem>2001-11-29 06:38:57 +0000
commit2d9e6352c1607442f80ccbfa6880978b8396f8c6 (patch)
tree2fc017def027148bfbbbb7f9de0f329c019c68d6
parentde7cd4d12e7a1b9aba58b6378330d276f328afda (diff)
downloadnetdev-vger-cvs-2d9e6352c1607442f80ccbfa6880978b8396f8c6.tar.gz
Only reports gigabit as supported if
gp->gigabit_capable is true. Also, recognize Enable Semiconductor phys.
-rw-r--r--drivers/net/sungem.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 1e1bf2523..078a9fabb 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -1,4 +1,4 @@
-/* $Id: sungem.c,v 1.38 2001-11-29 04:41:17 davem Exp $
+/* $Id: sungem.c,v 1.39 2001-11-29 06:38:57 davem Exp $
* sungem.c: Sun GEM ethernet driver.
*
* Copyright (C) 2000, 2001 David S. Miller (davem@redhat.com)
@@ -1526,6 +1526,11 @@ static void gem_init_phy(struct gem *gp)
gp->phy_mod = phymod_generic;
break;
+ case 0x437420:
+ printk("Enable Semiconductor\n");
+ gp->phy_mod = phymod_generic;
+ break;
+
default:
printk("Unknown\n");
gp->phy_mod = phymod_generic;
@@ -2397,9 +2402,13 @@ static int gem_ethtool_ioctl(struct net_device *dev, void *ep_user)
ecmd.supported =
(SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full |
SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full |
- SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full |
SUPPORTED_Autoneg | SUPPORTED_TP | SUPPORTED_MII);
+ if (gp->gigabit_capable)
+ ecmd.supported |=
+ (SUPPORTED_1000baseT_Half |
+ SUPPORTED_1000baseT_Full);
+
/* XXX hardcoded stuff for now */
ecmd.port = PORT_MII;
ecmd.transceiver = XCVR_EXTERNAL;