1 files changed, 0 insertions, 69 deletions
diff --git a/target/linux/generic/backport-4.19/730-v5.5-net-sfp-allow-fault-processing-to-transition-to-othe.patch b/target/linux/generic/backport-4.19/730-v5.5-net-sfp-allow-fault-processing-to-transition-to-othe.patch
deleted file mode 100644
index 6e34e6cc0f..0000000000
--- a/target/linux/generic/backport-4.19/730-v5.5-net-sfp-allow-fault-processing-to-transition-to-othe.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 2aa424ee7fbe43e2cd24e28c2f6388c4e1796bd2 Mon Sep 17 00:00:00 2001
-From: Russell King <rmk+kernel@armlinux.org.uk>
-Date: Fri, 18 Oct 2019 09:58:33 +0100
-Subject: [PATCH 628/660] net: sfp: allow fault processing to transition to
- other states
-
-Add the next state to sfp_sm_fault() so that it can branch to other
-states. This will be necessary to improve the initialisation path.
-
-Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
----
- drivers/net/phy/sfp.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- a/drivers/net/phy/sfp.c
-+++ b/drivers/net/phy/sfp.c
-@@ -1269,7 +1269,7 @@ static bool sfp_los_event_inactive(struc
- 		event == SFP_E_LOS_LOW);
- }
- 
--static void sfp_sm_fault(struct sfp *sfp, bool warn)
-+static void sfp_sm_fault(struct sfp *sfp, unsigned int next_state, bool warn)
- {
- 	if (sfp->sm_retries && !--sfp->sm_retries) {
- 		dev_err(sfp->dev,
-@@ -1279,7 +1279,7 @@ static void sfp_sm_fault(struct sfp *sfp
- 		if (warn)
- 			dev_err(sfp->dev, "module transmit fault indicated\n");
- 
--		sfp_sm_next(sfp, SFP_S_TX_FAULT, T_FAULT_RECOVER);
-+		sfp_sm_next(sfp, next_state, T_FAULT_RECOVER);
- 	}
- }
- 
-@@ -1619,14 +1619,14 @@ static void sfp_sm_main(struct sfp *sfp,
- 
- 	case SFP_S_INIT:
- 		if (event == SFP_E_TIMEOUT && sfp->state & SFP_F_TX_FAULT)
--			sfp_sm_fault(sfp, true);
-+			sfp_sm_fault(sfp, SFP_S_TX_FAULT, true);
- 		else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR)
- 	init_done:	sfp_sm_link_check_los(sfp);
- 		break;
- 
- 	case SFP_S_WAIT_LOS:
- 		if (event == SFP_E_TX_FAULT)
--			sfp_sm_fault(sfp, true);
-+			sfp_sm_fault(sfp, SFP_S_TX_FAULT, true);
- 		else if (sfp_los_event_inactive(sfp, event))
- 			sfp_sm_link_up(sfp);
- 		break;
-@@ -1634,7 +1634,7 @@ static void sfp_sm_main(struct sfp *sfp,
- 	case SFP_S_LINK_UP:
- 		if (event == SFP_E_TX_FAULT) {
- 			sfp_sm_link_down(sfp);
--			sfp_sm_fault(sfp, true);
-+			sfp_sm_fault(sfp, SFP_S_TX_FAULT, true);
- 		} else if (sfp_los_event_active(sfp, event)) {
- 			sfp_sm_link_down(sfp);
- 			sfp_sm_next(sfp, SFP_S_WAIT_LOS, 0);
-@@ -1650,7 +1650,7 @@ static void sfp_sm_main(struct sfp *sfp,
- 
- 	case SFP_S_REINIT:
- 		if (event == SFP_E_TIMEOUT && sfp->state & SFP_F_TX_FAULT) {
--			sfp_sm_fault(sfp, false);
-+			sfp_sm_fault(sfp, SFP_S_TX_FAULT, false);
- 		} else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) {
- 			dev_info(sfp->dev, "module transmit fault recovered\n");
- 			sfp_sm_link_check_los(sfp);