diff options
Diffstat (limited to 'drivers/net/e1000e/lib.c')
| -rw-r--r-- | drivers/net/e1000e/lib.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index a8b2c0de27c4..b0d2a60aa490 100644 --- a/drivers/net/e1000e/lib.c +++ b/drivers/net/e1000e/lib.c | |||
| @@ -1262,24 +1262,21 @@ s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, u16 *dup | |||
| 1262 | u32 status; | 1262 | u32 status; |
| 1263 | 1263 | ||
| 1264 | status = er32(STATUS); | 1264 | status = er32(STATUS); |
| 1265 | if (status & E1000_STATUS_SPEED_1000) { | 1265 | if (status & E1000_STATUS_SPEED_1000) |
| 1266 | *speed = SPEED_1000; | 1266 | *speed = SPEED_1000; |
| 1267 | e_dbg("1000 Mbs, "); | 1267 | else if (status & E1000_STATUS_SPEED_100) |
| 1268 | } else if (status & E1000_STATUS_SPEED_100) { | ||
| 1269 | *speed = SPEED_100; | 1268 | *speed = SPEED_100; |
| 1270 | e_dbg("100 Mbs, "); | 1269 | else |
| 1271 | } else { | ||
| 1272 | *speed = SPEED_10; | 1270 | *speed = SPEED_10; |
| 1273 | e_dbg("10 Mbs, "); | ||
| 1274 | } | ||
| 1275 | 1271 | ||
| 1276 | if (status & E1000_STATUS_FD) { | 1272 | if (status & E1000_STATUS_FD) |
| 1277 | *duplex = FULL_DUPLEX; | 1273 | *duplex = FULL_DUPLEX; |
| 1278 | e_dbg("Full Duplex\n"); | 1274 | else |
| 1279 | } else { | ||
| 1280 | *duplex = HALF_DUPLEX; | 1275 | *duplex = HALF_DUPLEX; |
| 1281 | e_dbg("Half Duplex\n"); | 1276 | |
| 1282 | } | 1277 | e_dbg("%u Mbps, %s Duplex\n", |
| 1278 | *speed == SPEED_1000 ? 1000 : *speed == SPEED_100 ? 100 : 10, | ||
| 1279 | *duplex == FULL_DUPLEX ? "Full" : "Half"); | ||
| 1283 | 1280 | ||
| 1284 | return 0; | 1281 | return 0; |
| 1285 | } | 1282 | } |
