Revert "tecff-broken-wlan-workaround: add fix for mt7915 bug"

tecff-broken-wlan-workaround/files/lib/gluon/broken-wlan-workaround/broken-wlan-workaround.sh

@@ -14,28 +14,28 @@
 DEBUG=false
 
 # check if node has wlan
 if [ ! -d /sys/class/ieee80211 ] || [ "$(ls -l /sys/class/ieee80211/ | wc -l)" -eq 0 ]; then
 	$($DEBUG) && logger -s -t "$SCRIPTNAME" -p 5 "node has no wlan, aborting."
 	exit
 fi
 
 # don't do anything while an autoupdater process is running
 pgrep autoupdater >/dev/null
 if [ "$?" == "0" ]; then
 	logger -s -t "$SCRIPTNAME" -p 5 "autoupdater is running, aborting."
 	exit
 fi
 
 # don't run this script if another instance is still running
 exec 200<$0
 flock -n 200
 if [ "$?" != "0" ]; then
 	logger -s -t "$SCRIPTNAME" -p 5 "failed to acquire lock, another instance of this script might still be running, aborting."
 	exit
 fi
 
 # check if node uses a wlan driver and gather interfaces and devices
 for i in $(ls /sys/class/net/); do
 	# gather a list of interfaces
 	if [ -n "$WLAN_INTERFACES" ]; then
 		WLAN_INTERFACES="$WLAN_INTERFACES $i"
@@ -44,8 +44,8 @@
 	fi
 	# gather a list of devices
 	if expr "$i" : "\(client\|mesh\|owe\)[0-9]" >/dev/null; then
 		WIRELESS_UCI="$(uci show wireless | grep $i | cut -d"." -f1-2)"
 		WLAN_DEVICE="$(uci get ${WIRELESS_UCI}.device)"
 		if [ -n "$WLAN_DEVICES" ]; then
 			if ! expr "$WLAN_DEVICES" : ".*${WLAN_DEVICE}.*" >/dev/null; then
 				WLAN_DEVICES="$WLAN_DEVICES $WLAN_DEVICE"
@@ -75,9 +75,9 @@
 WLANMESHCONNECTIONS=0
 for wlan_interface in $WLAN_INTERFACES; do
 	if expr "$wlan_interface" : "mesh[0-9]" >/dev/null; then
 		if [ "$(batctl o | egrep "$wlan_interface" | wc -l)" -gt 0 ]; then
 			WLANMESHCONNECTIONS=1
 			$($DEBUG) && logger -s -t "$SCRIPTNAME" -p 5 "found wlan mesh partners."
 			if [ ! -f "$MESHFILE" ]; then
 				# create file so we can check later if there was a wlan mesh connection before
 				touch $MESHFILE
@@ -89,11 +89,11 @@
 
 # check if there are local wlan batman clients
 WLANFFCONNECTIONS=0
 WLANFFCONNECTIONCOUNT="$(batctl tl | grep W | wc -l)"
 if [ "$WLANFFCONNECTIONCOUNT" -gt 0 ]; then
 	# note: this check doesn't know which radio the clients are on
 	WLANFFCONNECTIONS=1
 	$($DEBUG) && logger -s -t "$SCRIPTNAME" -p 5 "found batman local clients."
 	if [ ! -f "$CLIENTFILE" ]; then
 		# create file so we can check later if there were batman local clients before
 		touch $CLIENTFILE
@@ -104,10 +104,10 @@
 WLANPRIVCONNECTIONS=0
 for wlan_interface in $WLAN_INTERFACES; do
 	if expr "$wlan_interface" : "wlan[0-9]" >/dev/null; then
 		iw dev $wlan_interface station dump 2>/dev/null | grep -q Station
 		if [ "$?" == "0" ]; then
 			WLANPRIVCONNECTIONS=1
 			$($DEBUG) && logger -s -t "$SCRIPTNAME" -p 5 "found private wlan clients."
 			if [ ! -f "$PRIVCLIENTFILE" ]; then
 				# create file so we can check later if there were private wlan clients before
 				touch $PRIVCLIENTFILE
@@ -121,7 +121,7 @@
 GWCONNECTION=0
 if [ -f /var/gluon/state/has_default_gw4 ] && [ -f /var/gluon/state/can_reach_ntp ]; then
 	GWCONNECTION=1
 	$($DEBUG) && logger -s -t "$SCRIPTNAME" -p 5 "found a batman gateway and can ping at least one of the NTP servers."
 	if [ ! -f "$GWFILE" ]; then
 		# create file so we can check later if there was a reachable gateway before
 		touch $GWFILE
@@ -135,7 +135,7 @@
 		WLANRESTART=1
 		logger -s -t "$SCRIPTNAME" -p 5 "found no wlan connection, but there was one before."
 	else
 		$($DEBUG) && logger -s -t "$SCRIPTNAME" -p 5 "found no wlan connection, but that is no reason to act, because this node had no wlan connections since its last reboot."
 	fi
 fi
 if [ "$GWCONNECTION" -eq 0 ]; then
@@ -144,21 +144,10 @@
 		WLANRESTART=1
 		logger -s -t "$SCRIPTNAME" -p 5 "found no working gateway connection, but there was one before."
 	else
 		$($DEBUG) && logger -s -t "$SCRIPTNAME" -p 5 "found no working gateway connection, but that is no reason to act, because this node had no gateway since its last reboot."
 	fi
 fi
 
-if ! cat /sys/kernel/debug/ieee80211/phy*/mt76/rf_regval > /dev/null; then
-	# https://github.com/freifunk-gluon/gluon/issues/3154#issuecomment-2125452973
-    logger -p 0 -t "$SCRIPTNAME" "wifi seems crashed; reloading driver"; 
-	# delete old hostapd files, as they are not needed anymore
-	# and mangle with the ffac-ssid-changer
-	rmmod mt7915e && rm /var/run/hostapd-*.conf* && modprobe mt7915e
-	# directly restart wifi
-	WLANRESTART=1
-	touch $RESTARTFILE
-fi
-
 if [ ! -f "$RESTARTFILE" ] && [ "$WLANRESTART" -eq 1 ]; then
 	# delaying wlan restart until the next script run
 	touch $RESTARTFILE
@@ -172,11 +161,11 @@
 	rm -f $RESTARTFILE
 	touch $RESTARTINFOFILE
 	for wlan_device in $WLAN_DEVICES; do
 		wifi down $wlan_device
 	done
 	sleep 1
 	for wlan_device in $WLAN_DEVICES; do
 		wifi up $wlan_device
 	done
 elif [ -f "$RESTARTFILE" ]; then
 	logger -s -t "$SCRIPTNAME" -p 5 "everything seems to be ok again."