From cbf7d39c8cf3a8a3c791068bed5a698c05617458 Mon Sep 17 00:00:00 2001 From: Denis Kirjanov Date: Fri, 3 Sep 2010 10:05:40 +0000 Subject: [PATCH] --- yaml --- r: 214300 b: refs/heads/master c: 3c083edc6d0d53a050672b15e3594d07d81b42e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ns83820.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 78ba665e5b59..56a7721c6222 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7457e911c72eb0041b007943b0a29aab5a1c4a39 +refs/heads/master: 3c083edc6d0d53a050672b15e3594d07d81b42e5 diff --git a/trunk/drivers/net/ns83820.c b/trunk/drivers/net/ns83820.c index b3cebb1204f1..379af3e4edcc 100644 --- a/trunk/drivers/net/ns83820.c +++ b/trunk/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) {