From patchwork Sat Oct 14 11:09:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Archer C25: Fix disabling 5 GHz From: Adrian Schmutzler X-Patchwork-Id: 561 Message-Id: <1507979388-1212-1-git-send-email-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Sat, 14 Oct 2017 13:09:48 +0200 Since WiFi phy adapters are deleted and recreated, the initial workaround to disable 5 GHz is not working anymore. We thus disable 5 GHz on any creation of the relevant adapter. APPLY ONLY AFTER CHANNEL PATCH! Signed-off-by: Adrian Schmutzler --- src/packages/fff/fff-network/ar71xx/network.archer-c25-v1 | 3 --- src/packages/fff/fff-wireless/files/lib/functions/fff/wireless | 9 +++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1 b/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1 index 1d58c9c..d7b95a1 100644 --- a/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c25-v1 @@ -8,6 +8,3 @@ BATMAN_PORTS="3 4 0t" ETHMESHMAC=eth1 ROUTERMAC=eth0 - -uci -q set "wireless.radio0.disabled=1" -uci -q commit wireless diff --git a/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless b/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless index 5c93690..4731179 100644 --- a/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless +++ b/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless @@ -25,11 +25,14 @@ wifiAddPhy() { local channel=$2 local radio="radio$(echo "$phy" | tr -d -C "0-9")" local hwmode="11g" + local frq="2" if [ "$channel" = "auto5" ] ; then hwmode="11a" channel="auto" + frq="5" elif ( ! [ "$channel" = "auto" ] ) && [ "$channel" -gt "14" ]; then hwmode="11a" + frq="5" fi uci batch <<-__EOF__ @@ -49,6 +52,12 @@ wifiAddPhy() { fi uci commit wireless + BOARD="$(uci -q get board.model.name)" + if [ "$frq" = "5" ] && [ "$BOARD" = "archer-c25-v1" ] ; then + uci -q set "wireless.${radio}.disabled=1" + uci -q commit wireless + fi + echo "${radio}" return 0 }