From dd3214f95d3557fc4c8dc794620149f4e3f4d2e8 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Sat, 9 Mar 2019 15:59:32 +0100 Subject: [PATCH] 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 --- package/kernel/mac80211/Makefile | 2 +- .../kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index eedd3f9e89..d68738aca5 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:=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 e7d442f8ef..e9389e3447 100644 --- 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" -- 2.30.2