diff options
| -rw-r--r-- | drivers/net/e1000/e1000_param.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c index cf2a279307e1..f8862e203ac9 100644 --- a/drivers/net/e1000/e1000_param.c +++ b/drivers/net/e1000/e1000_param.c | |||
| @@ -760,22 +760,13 @@ e1000_check_copper_options(struct e1000_adapter *adapter) | |||
| 760 | case SPEED_1000: | 760 | case SPEED_1000: |
| 761 | DPRINTK(PROBE, INFO, "1000 Mbps Speed specified without " | 761 | DPRINTK(PROBE, INFO, "1000 Mbps Speed specified without " |
| 762 | "Duplex\n"); | 762 | "Duplex\n"); |
| 763 | DPRINTK(PROBE, INFO, | 763 | goto full_duplex_only; |
| 764 | "Using Autonegotiation at 1000 Mbps " | ||
| 765 | "Full Duplex only\n"); | ||
| 766 | adapter->hw.autoneg = adapter->fc_autoneg = 1; | ||
| 767 | adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL; | ||
| 768 | break; | ||
| 769 | case SPEED_1000 + HALF_DUPLEX: | 764 | case SPEED_1000 + HALF_DUPLEX: |
| 770 | DPRINTK(PROBE, INFO, | 765 | DPRINTK(PROBE, INFO, |
| 771 | "Half Duplex is not supported at 1000 Mbps\n"); | 766 | "Half Duplex is not supported at 1000 Mbps\n"); |
| 772 | DPRINTK(PROBE, INFO, | 767 | /* fall through */ |
| 773 | "Using Autonegotiation at 1000 Mbps " | ||
| 774 | "Full Duplex only\n"); | ||
| 775 | adapter->hw.autoneg = adapter->fc_autoneg = 1; | ||
| 776 | adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL; | ||
| 777 | break; | ||
| 778 | case SPEED_1000 + FULL_DUPLEX: | 768 | case SPEED_1000 + FULL_DUPLEX: |
| 769 | full_duplex_only: | ||
| 779 | DPRINTK(PROBE, INFO, | 770 | DPRINTK(PROBE, INFO, |
| 780 | "Using Autonegotiation at 1000 Mbps Full Duplex only\n"); | 771 | "Using Autonegotiation at 1000 Mbps Full Duplex only\n"); |
| 781 | adapter->hw.autoneg = adapter->fc_autoneg = 1; | 772 | adapter->hw.autoneg = adapter->fc_autoneg = 1; |