mac80211: netifd: Use a mask when using `iw set antenna`

The keyword "all" is only supported by `iw set antenna` if
it's used as the only argument.
Convert "all" into a mask before calling `iw set antenna`.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index eedd3f9e89559031ea218b149cd3509ed8acf7a4..d68738aca51ccb96770828cc14a4503267e64e5c 100644 (file)
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mac80211
 
 PKG_VERSION:=4.19.23-1
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v4.19.23/
 PKG_HASH:=703e940b542eb56067fcd847a7c69398dcc9829f34472647eea4211cb2ab3b83
 

diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index e7d442f8ef1a0efb8087be90a740b4cd6348337f..e9389e34477b9cf4f90c4c61994c121abdaaebaf 100644 (file)
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -781,11 +781,14 @@ drv_mac80211_setup() {
                done
        }
 
-       set_default rxantenna all
-       set_default txantenna all
+       set_default rxantenna 0xffffffff
+       set_default txantenna 0xffffffff
        set_default distance 0
        set_default antenna_gain 0
 
+       [ "$txantenna" = "all" ] && txantenna=0xffffffff
+       [ "$rxantenna" = "all" ] && rxantenna=0xffffffff
+
        iw phy "$phy" set antenna $txantenna $rxantenna >/dev/null 2>&1
        iw phy "$phy" set antenna_gain $antenna_gain
        iw phy "$phy" set distance "$distance"