[PATCH 16/22] e1000: Rewrite parm handling code to warn when forcing autoneg to gig only.

[Kok, Auke]

Signed-off-by: Jesse Brandeburg <[EMAIL PROTECTED]>
Signed-off-by: Auke Kok <[EMAIL PROTECTED]>
---

 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 cf2a279..f8862e2 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_
        case SPEED_1000:
                DPRINTK(PROBE, INFO, "1000 Mbps Speed specified without "
                        "Duplex\n");
-               DPRINTK(PROBE, INFO,
-                       "Using Autonegotiation at 1000 Mbps "
-                       "Full Duplex only\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 1;
-               adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
-               break;
+               goto full_duplex_only;
        case SPEED_1000 + HALF_DUPLEX:
                DPRINTK(PROBE, INFO,
                        "Half Duplex is not supported at 1000 Mbps\n");
-               DPRINTK(PROBE, INFO,
-                       "Using Autonegotiation at 1000 Mbps "
-                       "Full Duplex only\n");
-               adapter->hw.autoneg = adapter->fc_autoneg = 1;
-               adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;
-               break;
+               /* fall through */
        case SPEED_1000 + FULL_DUPLEX:
+full_duplex_only:
                DPRINTK(PROBE, INFO,
                       "Using Autonegotiation at 1000 Mbps Full Duplex only\n");
                adapter->hw.autoneg = adapter->fc_autoneg = 1;



---
Auke Kok <[EMAIL PROTECTED]>
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html