From: Denis Vlasenko <[EMAIL PROTECTED]>

Fixes stuck "carrier off" condition when ethernet line speed/duplex
autonegotiation is turned off before cable is plugged in.

Signed-off-by: Denis Vlasenko <[EMAIL PROTECTED]>
Cc: Jeff Garzik <[EMAIL PROTECTED]>
Cc: Lee Revell <[EMAIL PROTECTED]>
Cc: Roger Luethi <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 drivers/net/mii.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

diff -puN drivers/net/mii.c~via-rhine-link-loss-autoneg-off-==-trouble 
drivers/net/mii.c
--- devel/drivers/net/mii.c~via-rhine-link-loss-autoneg-off-==-trouble  
2006-03-08 00:05:51.000000000 -0800
+++ devel-akpm/drivers/net/mii.c        2006-03-08 00:05:51.000000000 -0800
@@ -267,8 +267,10 @@ unsigned int mii_check_media (struct mii
        int lpa2 = 0;
 
        /* if forced media, go no further */
-       if (mii->force_media)
+       if (mii->force_media) {
+               netif_carrier_on(mii->dev);
                return 0; /* duplex did not change */
+       }
 
        /* check current and old link status */
        old_carrier = netif_carrier_ok(mii->dev) ? 1 : 0;
_
-
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

Reply via email to