From patchwork Fri Jul 3 11:53:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Hoffmann X-Patchwork-Id: 1322342 X-Patchwork-Delegate: mail@david-bauer.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=3e8.eu Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=YXNqu+bY; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=3e8.eu header.i=@3e8.eu header.a=rsa-sha256 header.s=mail20170724 header.b=KvIog9v6; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ytjK1Mrtz9sRW for ; Fri, 3 Jul 2020 21:56:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=rT6XN+5nZ8/ULk/WPxjgEVuPGy6n9ZAWckT9Ub0Ayec=; b=YXNqu+bYN/z4w335aeU9Xj6q2e zl7ZlRbzqkgryy9pmdlq4Bh9HhYWaLZWBzzNDmrRuBiArX2SCYMDRcFZNx4vH41Y5/f0eqr/9RR6s fblx/Lqhiw6cC9Hro/wr82w3RpuBqAqMijZNixuUptOBMvPPVCSWAP4IUXYYe1rHp40Oetl7hNJtg SYev3ptH0dS95qoqEV/UnzbmieMvHz4m7o7YUxH1NtZ/T+1nsMv2OuGGDiEUYYkcR+S6EREE1NULm RoGcAMotNSewEiMbkAIvxuX8qRl3SuR4JLumu03CYaAVUNi3OdDzLNuNIHL7jNMuSEJNbjeF9ETBE 5FfFpj8A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jrKGl-00087r-3B; Fri, 03 Jul 2020 11:54:15 +0000 Received: from srv4.3e8.eu ([2001:67c:12a0:200::2]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jrKGi-000867-8u for openwrt-devel@lists.openwrt.org; Fri, 03 Jul 2020 11:54:13 +0000 Received: from localhost.localdomain (p200300c6cf1568a0e852b41a2bded162.dip0.t-ipconnect.de [IPv6:2003:c6:cf15:68a0:e852:b41a:2bde:d162]) (using TLSv1.3 with cipher TLS_CHACHA20_POLY1305_SHA256 (256/256 bits)) (No client certificate requested) by srv4.3e8.eu (Postfix) with ESMTPSA id CFC5E600C7; Fri, 3 Jul 2020 13:53:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=3e8.eu; s=mail20170724; t=1593777234; bh=PD0WQpcFHEbGBEcTBKtbeTFTuNmur8FgmSEvA1DlQAY=; h=From:To:Cc:Subject:Date:From; b=KvIog9v6CFw2OVrRuaLAbV3d+7bpWEQ3ErNL1UWhomejiDftqNpcSH/bJJegWTX2A 2CR4a+eDdLrfU4877l3T3W+yMmarf9Fkc7PYXhbXMPrR6jaB0Jb6mkxP4Il0O+BKqO d9GiKTCHRIJWE0XY2fTY16bh4qu+XnIuayjE3f+NajQTcOnfUGDx7aoSoFrThrziRG QdzXM11yrrOBbxxYovLjv4Wh2N0rCfMEmWVkz4WXPpJNBZ2lwHgjlu82FTVkEJ9w6o Z7v00IRSDbNjha+CiJY418WgxxSnbmuosSxtD5FXbt3R3Os+vEytCqfyJmmn3m1wP3 M78zkl9DsyVQw== From: Jan Hoffmann To: openwrt-devel@lists.openwrt.org Subject: [PATCH] mac80211: allow ACS restriction with fixed channel Date: Fri, 3 Jul 2020 13:53:47 +0200 Message-Id: <20200703115347.1859067-1-jan@3e8.eu> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200703_075412_543847_A5E121EE X-CRM114-Status: GOOD ( 10.80 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jan Hoffmann Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This can be useful when a DFS channel is configured, as the ACS channel list is taken into account when switching channels after a radar event. For example, this allows to prevent the SRD channels from being used in that case. Signed-off-by: Jan Hoffmann --- package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index de003e3d23..0d5c3043be 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -101,7 +101,7 @@ mac80211_hostapd_setup_base() { json_select config [ "$auto_channel" -gt 0 ] && channel=acs_survey - [ "$auto_channel" -gt 0 ] && json_get_values channel_list channels + json_get_values channel_list channels [ "$auto_channel" -gt 0 ] && json_get_vars acs_exclude_dfs [ -n "$acs_exclude_dfs" ] && [ "$acs_exclude_dfs" -gt 0 ] &&