travelmate: fix loss of configured uplink mac address

- pass the station details to the "rev" call so the uplink section
  stays resolved, fixes #30099
- the same empty trm_uplinkcfg also silently skipped disabling the uplink
  after trm_maxretry was reached - fixed that too with this oneliner

Signed-off-by: Dirk Brenken <redacted>

diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile
index 71ca99568bc5377365350ad28d7b6feca0ee95ff..94769f3b441933c8944e3982b8c2fb3a87d96556 100644 (file)
--- a/net/travelmate/Makefile
+++ b/net/travelmate/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=travelmate
 PKG_VERSION:=2.4.6
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/net/travelmate/files/travelmate-functions.sh b/net/travelmate/files/travelmate-functions.sh
index b72e891632c7cbd0cf6f179f7b4c296eb700f157..ce7d3d03f07049342df38dd00b2d3a8678758d7e 100644 (file)
--- a/net/travelmate/files/travelmate-functions.sh
+++ b/net/travelmate/files/travelmate-functions.sh
@@ -1496,7 +1496,7 @@ f_main() {
                                                                                return 0
                                                                        else
                                                                                uci -q revert "wireless"
-                                                                               f_check "rev" "false"
+                                                                               f_check "rev" "false" "${sta_radio}" "${sta_essid}" "${sta_bssid}"
                                                                                if [ "${retrycnt}" -eq "${trm_maxretry}" ]; then
                                                                                        if [ -n "${trm_uplinkcfg}" ]; then
                                                                                                uci_set "travelmate" "${trm_uplinkcfg}" "enabled" "0"