From patchwork Tue Oct 20 22:33:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Bauer X-Patchwork-Id: 1385255 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=yivpkcJR; 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 4CG7kV3CmKz9sPB for ; Wed, 21 Oct 2020 09:35:44 +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: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:In-Reply-To:References:List-Owner; bh=SWbHePnuII0rfT/izYTHRQJegY9H/QJzyPBq8ahlyEI=; b=yivpkcJRJj4C3ghQRVgIcJSVli dYuRjS8CNoB6LOGAfpvRU1vgZQaxyCfNf1ZpEpdEVbFs8M7VwtsBLEpeRqeMQBi+lO2Ciuu5d6rqm zEEuGPP+De6okacOcsmbw/XxvL6JHAsqbkhhHqIPAdsF8Vksbcc17d/P8UJNdTsb5+JJQS52l0s+d tl/gcpbFqeM3aOiSydW+AKRlE/+TG8Lq/5GIId53OVslSW9gc0Ovm+zKeI/X+CbC74juEsvqixXg7 UkiBWhCMmcfDOfEfzjM9V8AfPqZ3EgA8rgSHnrnwfJbOYDJwQhVLrC0qJWhoJKhURbf2t8DYJk9XB hR6w1xuQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV0CU-0006sa-Hc; Tue, 20 Oct 2020 22:33:50 +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 1kV0CQ-0006nE-Nk 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 835E923B81 for ; Wed, 21 Oct 2020 00:33:42 +0200 (CEST) From: David Bauer To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/2] hostapd: make rrm report independent of ieee80211k setting Date: Wed, 21 Oct 2020 00:33:25 +0200 Message-Id: <20201020223326.388456-1-mail@david-bauer.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_183346_875885_BB7152A6 X-CRM114-Status: GOOD ( 11.61 ) 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 Allow to configure both RRM beacon as well as neighbor reports independently and only enable them by default in case the ieee80211k config option is set. Signed-off-by: David Bauer --- package/network/services/hostapd/files/hostapd.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index 4d06e8afa2..39a175fdb1 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -634,17 +634,16 @@ hostapd_set_bss_options() { append bss_conf "bss_transition=$bss_transition" "$N" fi - json_get_vars ieee80211k + json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report set_default ieee80211k 0 if [ "$ieee80211k" -eq "1" ]; then - json_get_vars rrm_neighbor_report rrm_beacon_report - set_default rrm_neighbor_report 1 set_default rrm_beacon_report 1 - append bss_conf "rrm_neighbor_report=$rrm_neighbor_report" "$N" - append bss_conf "rrm_beacon_report=$rrm_beacon_report" "$N" fi + [ "$rrm_neighbor_report" -eq "1" ] && append bss_conf "rrm_neighbor_report=$rrm_neighbor_report" "$N" + [ "$rrm_beacon_report" -eq "1" ] && append bss_conf "rrm_beacon_report=$rrm_beacon_report" "$N" + if [ "$wpa" -ge "1" ]; then json_get_vars ieee80211r set_default ieee80211r 0