From 47ac658fd472fd11e0e8214fd40db3edb5a360db Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 31 Oct 2023 15:30:07 +0100
Subject: [PATCH 1/2] Remove 00-nego, make more issues than fixes

---
 openmptcprouter/files/etc/hotplug.d/iface/00-nego | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 openmptcprouter/files/etc/hotplug.d/iface/00-nego

diff --git a/openmptcprouter/files/etc/hotplug.d/iface/00-nego b/openmptcprouter/files/etc/hotplug.d/iface/00-nego
deleted file mode 100644
index 24ef81106..000000000
--- a/openmptcprouter/files/etc/hotplug.d/iface/00-nego
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-# Needed for some device, like rtl8156 2.5G USB adapter
-[ "$ACTION" = "ifup" ] && [ -n "$DEVICE" ] && [ -n "$(lsusb | grep 8156)" ] && [ -n "$(ethtool $DEVICE | grep 2500)" ] && ethtool -s $DEVICE autoneg on
\ No newline at end of file

From 1101daba602413ef1cf6d287c2189d1011c64f84 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 2 Nov 2023 09:48:21 +0100
Subject: [PATCH 2/2] Fix ModemManager restart loop

---
 .../omr/post-tracking.d/001-post-tracking     | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking
index aef6be050..a34e5475a 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking
@@ -736,17 +736,18 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then
 		_log "Set $OMR_TRACKER_INTERFACE up"
 		ifup $OMR_TRACKER_INTERFACE
 		sleep 20
-	elif [ -n "$OMR_TRACKER_INTERFACE" ] && [ -n "$OMR_TRACKER_DEVICE" ] && ([ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "modemmanager" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "dhcp" ]); then
-		for modem in $(mmcli -L | awk -F/ '{ print $6}' | awk '{print $1}'); do
-			if [ -n "$(timeout 2 mmcli -m $modem -K | grep $OMR_TRACKER_DEVICE)" ]; then
-				modem_device=$(mmcli -m $modem -K | grep 'modem.generic.device ' | awk '{print $3}')
-				[ -n "$modem_device" ] && modem_interface=$(uci show network | grep $modem_device | awk -F. '{print $2}')
-				[ -n "$modem_interface" ] && {
-					_log "No answer from $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE), restart associed interface $modem_interface"
-					ifup $modem_interface
-				}
-			fi
-		done
+	#elif [ -n "$OMR_TRACKER_INTERFACE" ] && [ -n "$OMR_TRACKER_DEVICE" ] && ([ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "modemmanager" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "dhcp" ]); then
+	#	for modem in $(mmcli -L | awk -F/ '{ print $6}' | awk '{print $1}'); do
+	#		if [ -n "$(timeout 2 mmcli -m $modem -K | grep $OMR_TRACKER_DEVICE)" ]; then
+	#			modem_device=$(mmcli -m $modem -K | grep 'modem.generic.device ' | awk '{print $3}')
+	#			[ -n "$modem_device" ] && modem_interface=$(uci show network | grep $modem_device | awk -F. '{print $2}')
+	#			[ -n "$modem_interface" ] && {
+	#				_log "No answer from $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE), restart associed interface $modem_interface"
+	#				ifup $modem_interface
+	#				sleep 30
+	#			}
+	#		fi
+	#	done
 	fi
 
 	# This part must be done after modems restart because we have no idea when modems will be ready again... (another solution would be to check ModemManager status)