From patchwork Tue Oct 20 22:33:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Bauer X-Patchwork-Id: 1385256 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=none (p=none dis=none) header.from=david-bauer.net 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=0IcUQBE1; 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 4CG7kX29vXz9sPB for ; Wed, 21 Oct 2020 09:35:48 +1100 (AEDT) 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:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=l1bT1Wh1nK+fMFfDsz2jKnD3jUIvNCIWA3P56q9u0bU=; b=0IcUQBE1mK0+TejBoQHQ9F0Ll1 buLnIx5jczOddjDe4WChwBF8Zz3CmNfiMGExuImFwddFwcSpCQf5WukPH5B0oqpjY5gNwjhISU9/R XUxRg4NsqTiiG03dGwQtWsqrKK1EJg8Hm2gAdSz9vEHHKfaXXsVsLx3Nk8hHitvDQoh/TxhZwq85K EIAYUod8x0ZbvwN0bUQj+wxnElamTAxmJ19Zy9hrgTtgcLav+6g8bwekTUVDoQq0EnJv9tjxjrhsk 7iImshAHtd6Ddbdw0YWdyIJdqZj2HZBQfDF65y10fSrtiChPUUwoHGr3Fl6eaIfpU2n1K1+FR0h9t MYBJ7cCA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV0CT-0006sR-28; Tue, 20 Oct 2020 22:33:49 +0000 Received: from mars.blocktrron.ovh ([2001:41d0:401:3000::cbd] helo=mail.blocktrron.ovh) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV0CP-0006nD-UQ for openwrt-devel@lists.openwrt.org; Tue, 20 Oct 2020 22:33:47 +0000 Received: from localhost.localdomain (p200300e53f0f00005666a47d5acc093c.dip0.t-ipconnect.de [IPv6:2003:e5:3f0f:0:5666:a47d:5acc:93c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.blocktrron.ovh (Postfix) with ESMTPSA id E5EF223BAD for ; Wed, 21 Oct 2020 00:33:42 +0200 (CEST) From: David Bauer To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/2] hostapd: remove ieee80211v option Date: Wed, 21 Oct 2020 00:33:26 +0200 Message-Id: <20201020223326.388456-2-mail@david-bauer.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020223326.388456-1-mail@david-bauer.net> References: <20201020223326.388456-1-mail@david-bauer.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_183346_086550_6C6CC70E X-CRM114-Status: GOOD ( 13.51 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Remove the ieee80211v option. It previously was required to be enabled in order to use time_advertisement, time_zone, wnm_sleep_mode and bss_transition, however it didn't enable any of these options by default. Remove it, as configuring these options independently is enough. This change does not influence the behavior of any already configured setting. Signed-off-by: David Bauer --- .../network/services/hostapd/files/hostapd.sh | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index 39a175fdb1..ffdbdd9831 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -619,20 +619,12 @@ hostapd_set_bss_options() { append bss_conf "iapp_interface=$ifname" "$N" } - json_get_vars ieee80211v - set_default ieee80211v 0 - if [ "$ieee80211v" -eq "1" ]; then - json_get_vars time_advertisement time_zone wnm_sleep_mode bss_transition - - set_default time_advertisement 0 - set_default wnm_sleep_mode 0 - set_default bss_transition 0 - - append bss_conf "time_advertisement=$time_advertisement" "$N" - [ -n "$time_zone" ] && append bss_conf "time_zone=$time_zone" "$N" - append bss_conf "wnm_sleep_mode=$wnm_sleep_mode" "$N" - append bss_conf "bss_transition=$bss_transition" "$N" - fi + json_get_vars time_advertisement time_zone wnm_sleep_mode bss_transition + + [ -n "$time_advertisement" ] && append bss_conf "time_advertisement=$time_advertisement" "$N" + [ -n "$time_zone" ] && append bss_conf "time_zone=$time_zone" "$N" + [ -n "$wnm_sleep_mode" ] && append bss_conf "wnm_sleep_mode=$wnm_sleep_mode" "$N" + [ -n "$bss_transition" ] && append bss_conf "bss_transition=$bss_transition" "$N" json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report set_default ieee80211k 0