diff --git a/[refs] b/[refs]
index 449ec6a9f389..19152ba039db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4bd954e7c24063b15fa9abc8b4b1242772928ed
+refs/heads/master: 843813453f52e3378fc988c8364063fd4cb9d0e3
diff --git a/trunk/drivers/net/sfc/mdio_10g.c b/trunk/drivers/net/sfc/mdio_10g.c
index f131ad2b6832..f6a16428113d 100644
--- a/trunk/drivers/net/sfc/mdio_10g.c
+++ b/trunk/drivers/net/sfc/mdio_10g.c
@@ -368,13 +368,16 @@ void mdio_clause45_get_settings_ext(struct efx_nic *efx,
 	} else
 		ecmd->autoneg = AUTONEG_DISABLE;
 
-	/* If AN is enabled and complete, report best common mode */
-	if (ecmd->autoneg &&
-	    (mdio_clause45_read(efx, phy_id, MDIO_MMD_AN, MDIO_MMDREG_STAT1) &
-	     (1 << MDIO_AN_STATUS_AN_DONE_LBN))) {
-		u32 common, lpa;
-		lpa = mdio_clause45_get_an(efx, MDIO_AN_LPA, xnp_lpa);
-		common = ecmd->advertising & lpa;
+	if (ecmd->autoneg) {
+		/* If AN is complete, report best common mode,
+		 * otherwise report best advertised mode. */
+		u32 common = ecmd->advertising;
+		if (mdio_clause45_read(efx, phy_id, MDIO_MMD_AN,
+				       MDIO_MMDREG_STAT1) &
+		    (1 << MDIO_AN_STATUS_AN_DONE_LBN)) {
+			common &= mdio_clause45_get_an(efx, MDIO_AN_LPA,
+						       xnp_lpa);
+		}
 		if (common & ADVERTISED_10000baseT_Full) {
 			ecmd->speed = SPEED_10000;
 			ecmd->duplex = DUPLEX_FULL;