[openwrt/openwrt] mac80211: Fix wpa_supplicant config removal ubus call

[LEDE Commits]

blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/7ca9b82c389a643e81709b58e4e785a5de91330a

commit 7ca9b82c389a643e81709b58e4e785a5de91330a
Author: Sven Eckelmann <sven at narfation.org>
AuthorDate: Thu Oct 22 10:52:08 2020 +0200

    mac80211: Fix wpa_supplicant config removal ubus call
    
    If mac80211_setup_supplicant() is called with enabled=0 then it should just
    destroy the interface and remove the configuration from wpa_supplicant. But
    the ubus method call always returned
    
      Command failed: Method not found
    
    because the actual name of the method is "config_remove".
    
    Fixes: b5516603dd90 ("mac80211: more wifi reconf related fixes")
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    [bump PKG_RELEASE]
    Signed-off-by: David Bauer <mail at david-bauer.net>
---
 package/kernel/mac80211/Makefile                              | 2 +-
 package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index bf88484b78..8448350acf 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mac80211
 
 PKG_VERSION:=5.8-1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v5.8/
 PKG_HASH:=19b4174d89bf11ee221458e11f1e8dace26558498774b823051156f522d2036b
 
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index 11ea700b98..6ca12084cf 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -627,7 +627,7 @@ mac80211_setup_supplicant() {
 	local spobj="$(ubus -S list | grep wpa_supplicant.${ifname})"
 
 	[ "$enable" = 0 ] && {
-		ubus call wpa_supplicant.${phy} config_del "{\"iface\":\"$ifname\"}"
+		ubus call wpa_supplicant.${phy} config_remove "{\"iface\":\"$ifname\"}"
 		ip link set dev "$ifname" down
 		iw dev "$ifname" del
 		return 0