From 6f13a390355d15bc1ecff59eba769d0189d05083 Mon Sep 17 00:00:00 2001 From: Bob Cantor Date: Fri, 25 Jun 2021 04:14:47 +1000 Subject: [PATCH] mac80211: print an error if wifi teardown fails drv_mac80211_teardown fails silently if the device to be torn down is not defined. This commit prints an error message. branches affected: trunk, 21.02 Signed-off-by: Bob Cantor (cherry-picked from commit 3933e29d1b87c713167cf4730b68e5f18af4f140) --- package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index e3b26b287c..9a9c35fb5f 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -1076,6 +1076,10 @@ drv_mac80211_teardown() { json_select data json_get_vars phy json_select .. + [ -n "$phy" ] || { + echo "Bug: PHY is undefined for device '$1'" + return 1 + } mac80211_interface_cleanup "$phy" uci -q -P /var/state revert wireless._${phy} -- 2.30.2