--- v2
+++ v3
@@ -75,10 +75,10 @@
   * phy_start_aneg - start auto-negotiation for this PHY device
   * @phydev: the phy_device struct
 diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
-index 28edb3665ee9..6bded664ad86 100644
+index fd02ec265a39..f9a7c999821b 100644
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c
-@@ -1042,6 +1042,39 @@ static int phylink_attach_phy(struct phylink *pl, struct phy_device *phy,
+@@ -1043,6 +1043,39 @@ static int phylink_attach_phy(struct phylink *pl, struct phy_device *phy,
  	return phy_attach_direct(pl->netdev, phy, 0, interface);
  }
  
@@ -118,7 +118,7 @@
  /**
   * phylink_connect_phy() - connect a PHY to the phylink instance
   * @pl: a pointer to a &struct phylink returned from phylink_create()
-@@ -1061,6 +1094,9 @@ int phylink_connect_phy(struct phylink *pl, struct phy_device *phy)
+@@ -1062,6 +1095,9 @@ int phylink_connect_phy(struct phylink *pl, struct phy_device *phy)
  {
  	int ret;
  
@@ -128,7 +128,7 @@
  	/* Use PHY device/driver interface */
  	if (pl->link_interface == PHY_INTERFACE_MODE_NA) {
  		pl->link_interface = phy->interface;
-@@ -1136,6 +1172,9 @@ int phylink_fwnode_phy_connect(struct phylink *pl,
+@@ -1137,6 +1173,9 @@ int phylink_fwnode_phy_connect(struct phylink *pl,
  	if (!phy_dev)
  		return -ENODEV;
  
@@ -138,7 +138,7 @@
  	ret = phy_attach_direct(pl->netdev, phy_dev, flags,
  				pl->link_interface);
  	if (ret) {
-@@ -2096,10 +2135,28 @@ static int phylink_sfp_config(struct phylink *pl, struct phy_device *phy,
+@@ -2207,10 +2246,28 @@ static int phylink_sfp_config(struct phylink *pl, struct phy_device *phy,
  		return -EINVAL;
  	}