diff options
author | Denis Kirjanov <dkirjanov@hera.kernel.org> | 2010-09-03 06:05:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-06 21:15:37 -0400 |
commit | 3c083edc6d0d53a050672b15e3594d07d81b42e5 (patch) | |
tree | ce7184eef759fe81cf05e1b866bc4873baebda4e /drivers/net/ns83820.c | |
parent | 7457e911c72eb0041b007943b0a29aab5a1c4a39 (diff) |
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/ns83820.c')
-rw-r--r-- | drivers/net/ns83820.c | 12 |
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, | |||
1270 | 1270 | ||
1271 | cmd->supported = SUPPORTED_Autoneg; | 1271 | cmd->supported = SUPPORTED_Autoneg; |
1272 | 1272 | ||
1273 | /* we have optical interface */ | ||
1274 | if (dev->CFG_cache & CFG_TBI_EN) { | 1273 | if (dev->CFG_cache & CFG_TBI_EN) { |
1274 | /* we have optical interface */ | ||
1275 | cmd->supported |= SUPPORTED_1000baseT_Half | | 1275 | cmd->supported |= SUPPORTED_1000baseT_Half | |
1276 | SUPPORTED_1000baseT_Full | | 1276 | SUPPORTED_1000baseT_Full | |
1277 | SUPPORTED_FIBRE; | 1277 | SUPPORTED_FIBRE; |
1278 | cmd->port = PORT_FIBRE; | 1278 | cmd->port = PORT_FIBRE; |
1279 | } /* TODO: else copper related support */ | 1279 | } else { |
1280 | /* we have copper */ | ||
1281 | cmd->supported |= SUPPORTED_10baseT_Half | | ||
1282 | SUPPORTED_10baseT_Full | SUPPORTED_100baseT_Half | | ||
1283 | SUPPORTED_100baseT_Full | SUPPORTED_1000baseT_Half | | ||
1284 | SUPPORTED_1000baseT_Full | | ||
1285 | SUPPORTED_MII; | ||
1286 | cmd->port = PORT_MII; | ||
1287 | } | ||
1280 | 1288 | ||
1281 | cmd->duplex = fullduplex ? DUPLEX_FULL : DUPLEX_HALF; | 1289 | cmd->duplex = fullduplex ? DUPLEX_FULL : DUPLEX_HALF; |
1282 | switch (cfg / CFG_SPDSTS0 & 3) { | 1290 | switch (cfg / CFG_SPDSTS0 & 3) { |