summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDenis Kirjanov <dkirjanov@hera.kernel.org>2010-09-03 10:05:40 +0000
committerDavid S. Miller <davem@davemloft.net>2010-09-06 18:15:37 -0700
commit3c083edc6d0d53a050672b15e3594d07d81b42e5 (patch)
treece7184eef759fe81cf05e1b866bc4873baebda4e /drivers/net
parent7457e911c72eb0041b007943b0a29aab5a1c4a39 (diff)
downloadlinux-3.10-3c083edc6d0d53a050672b15e3594d07d81b42e5.tar.gz
linux-3.10-3c083edc6d0d53a050672b15e3594d07d81b42e5.tar.bz2
linux-3.10-3c083edc6d0d53a050672b15e3594d07d81b42e5.zip
ns83820: Add copper device settings
Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ns83820.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index b3cebb1204f..379af3e4edc 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1270,13 +1270,21 @@ static int ns83820_get_settings(struct net_device *ndev,
cmd->supported = SUPPORTED_Autoneg;
- /* we have optical interface */
if (dev->CFG_cache & CFG_TBI_EN) {
+ /* we have optical interface */
cmd->supported |= SUPPORTED_1000baseT_Half |
SUPPORTED_1000baseT_Full |
SUPPORTED_FIBRE;
cmd->port = PORT_FIBRE;
- } /* TODO: else copper related support */
+ } else {
+ /* we have copper */
+ cmd->supported |= SUPPORTED_10baseT_Half |
+ SUPPORTED_10baseT_Full | SUPPORTED_100baseT_Half |
+ SUPPORTED_100baseT_Full | SUPPORTED_1000baseT_Half |
+ SUPPORTED_1000baseT_Full |
+ SUPPORTED_MII;
+ cmd->port = PORT_MII;
+ }
cmd->duplex = fullduplex ? DUPLEX_FULL : DUPLEX_HALF;
switch (cfg / CFG_SPDSTS0 & 3) {