1 files changed, 0 insertions, 59 deletions
diff --git a/target/linux/generic/backport-5.4/708-v5.3-net-phylink-remove-netdev-from-phylink-mii-ioctl-emu.patch b/target/linux/generic/backport-5.4/708-v5.3-net-phylink-remove-netdev-from-phylink-mii-ioctl-emu.patch
deleted file mode 100644
index 1c3f1cc01a..0000000000
--- a/target/linux/generic/backport-5.4/708-v5.3-net-phylink-remove-netdev-from-phylink-mii-ioctl-emu.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 4c4323084e9a67210c8d269dceba1be99356c414 Mon Sep 17 00:00:00 2001
-From: Russell King <rmk+kernel@armlinux.org.uk>
-Date: Tue, 28 May 2019 10:57:18 +0100
-Subject: [PATCH 606/660] net: phylink: remove netdev from phylink mii ioctl
- emulation
-
-The netdev used in the phylink ioctl emulation is never used, so let's
-remove it.
-
-Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-Reviewed-by: Andrew Lunn <andrew@lunn.ch>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
----
- drivers/net/phy/phylink.c | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
---- a/drivers/net/phy/phylink.c
-+++ b/drivers/net/phy/phylink.c
-@@ -1360,8 +1360,8 @@ EXPORT_SYMBOL_GPL(phylink_ethtool_set_ee
-  *
-  * FIXME: should deal with negotiation state too.
-  */
--static int phylink_mii_emul_read(struct net_device *ndev, unsigned int reg,
--				 struct phylink_link_state *state, bool aneg)
-+static int phylink_mii_emul_read(unsigned int reg,
-+				 struct phylink_link_state *state)
- {
- 	struct fixed_phy_status fs;
- 	int val;
-@@ -1376,8 +1376,6 @@ static int phylink_mii_emul_read(struct
- 	if (reg == MII_BMSR) {
- 		if (!state->an_complete)
- 			val &= ~BMSR_ANEGCOMPLETE;
--		if (!aneg)
--			val &= ~BMSR_ANEGCAPABLE;
- 	}
- 	return val;
- }
-@@ -1473,8 +1471,7 @@ static int phylink_mii_read(struct phyli
- 	case MLO_AN_FIXED:
- 		if (phy_id == 0) {
- 			phylink_get_fixed_state(pl, &state);
--			val = phylink_mii_emul_read(pl->netdev, reg, &state,
--						    true);
-+			val = phylink_mii_emul_read(reg, &state);
- 		}
- 		break;
- 
-@@ -1487,8 +1484,7 @@ static int phylink_mii_read(struct phyli
- 			if (val < 0)
- 				return val;
- 
--			val = phylink_mii_emul_read(pl->netdev, reg, &state,
--						    true);
-+			val = phylink_mii_emul_read(reg, &state);
- 		}
- 		break;
- 	}