1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/mii.c b/drivers/net/mii.c
index 4a99c3919037..993570b1e2ae 100644
--- a/drivers/net/mii.c
+++ b/drivers/net/mii.c
@@ -302,7 +302,7 @@ void mii_check_link (struct mii_if_info *mii)
 }
 
 /**
- * mii_check_media - check the MII interface for a duplex change
+ * mii_check_media - check the MII interface for a carrier/speed/duplex change
  * @mii: the MII interface
  * @ok_to_print: OK to print link up/down messages
  * @init_media: OK to save duplex mode in @mii
@@ -318,10 +318,6 @@ unsigned int mii_check_media (struct mii_if_info *mii,
         int advertise, lpa, media, duplex;
         int lpa2 = 0;
 
-        /* if forced media, go no further */
-        if (mii->force_media)
-                return 0; /* duplex did not change */
-
         /* check current and old link status */
         old_carrier = netif_carrier_ok(mii->dev) ? 1 : 0;
         new_carrier = (unsigned int) mii_link_ok(mii);
@@ -345,6 +341,12 @@ unsigned int mii_check_media (struct mii_if_info *mii,
          */
         netif_carrier_on(mii->dev);
 
+        if (mii->force_media) {
+                if (ok_to_print)
+                        netdev_info(mii->dev, "link up\n");
+                return 0; /* duplex did not change */
+        }
+
         /* get MII advertise and LPA values */
         if ((!init_media) && (mii->advertising))
                 advertise = mii->advertising;