--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
-@@ -1131,6 +1131,184 @@ static void sfp_hwmon_remove(struct sfp
+@@ -1132,6 +1132,184 @@ static void sfp_hwmon_remove(struct sfp
}
#endif
/* Helpers */
static void sfp_module_tx_disable(struct sfp *sfp)
{
-@@ -1375,6 +1553,8 @@ static int sfp_sm_mod_probe(struct sfp *
+@@ -1376,6 +1554,8 @@ static int sfp_sm_mod_probe(struct sfp *
{
/* SFP module inserted - read I2C data */
struct sfp_eeprom_id id;
bool cotsworks;
u8 check;
int ret;
-@@ -1431,12 +1611,87 @@ static int sfp_sm_mod_probe(struct sfp *
+@@ -1432,12 +1612,87 @@ static int sfp_sm_mod_probe(struct sfp *
sfp->id = id;