From patchwork Sun May 16 16:06:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Marko X-Patchwork-Id: 1479088 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) 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=desiato.20200630 header.b=OIuR4txN; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=epNbOwMy; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (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 4FjnHt16Mgz9sSn for ; Mon, 17 May 2021 02:08:42 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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:Cc: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=iPuH4zaPtl4KBcwvLkP1Gury0FYkJx/ixnVWCEYoSdE=; b=OIuR4txNgXexJ5pzdCENuamoqH DrwfsvWwnDlFaoFvzHG1C1jmQl4cWQJ5LeR/Qr0m9N5eVcd29Tc+RyJy+6+cQEdyLSKAloPZg4lwP A2ZD6vUaeLMaYxiy6vC3sl3KiRANBHp58UvqY+L0P75amIXZfLQWpz5Ym3IMRpu2SlWd/B6IpFFjB wBUD6tOS/BjbiZMbGjO9l4nOtcT7cPSyZS3bRAfvuqBtComWGiv04HfNmMT+3SbBVIHBZx6gdZOJ0 6ohPMju+jkzWdS6lc5LubDDHcTrbYPFS9m/QhGNUmjoakl/l6Q+rP+nwvUj5Oe5BR5wVhlz0Wpcma J1g+0jnQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1liJIQ-00CWhP-Nf; Sun, 16 May 2021 16:07:14 +0000 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1liJIK-00CWg3-7N for openwrt-devel@lists.openwrt.org; Sun, 16 May 2021 16:07:10 +0000 Received: by mail-ed1-x52a.google.com with SMTP id s6so4035910edu.10 for ; Sun, 16 May 2021 09:07:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HCyXB/ypbIAqgW0/2GcHMojgQ38IzF8C4YgwQdf7VyU=; b=epNbOwMyN/iXuSvtHxLV3JpSrxLkKCVkyK8/3sI6qD5ft+g2S12xyYV291Rdwc78oT RmNIWxUtHs0pNZ6olwNV24C44lVMiPJZfvwuZEtYrURcdBBcFRqJgrhCRjAgwcX3m+it 8rdCWvx6igrNLhDuVOS3HqQxjfJwvH2CRY3KrYoIux+exul0Sy1oAV24vnWyiaaPYFEo g8ldbG4qZmR1QY+9xF4dnC+sNEBI29/oSM7qt/4Fmgudti5EXqWg5m1Ai4VJm84ET6H2 R5okbfwwb5zv3sQqNQahPYxVGW1wcMvAVNWr8GQloTFGHHgJqPgSFfvKeC9bIt5m1oa2 quvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HCyXB/ypbIAqgW0/2GcHMojgQ38IzF8C4YgwQdf7VyU=; b=D8vs/bpLq5oak+mZv9rt9qh5jBLeI0/w/+DJnVK8xHXxq+BgaWa+PhlO5/olyE5G8A 3cLtAYOUrjFcrfp5u/6tHAtRi6Ini5pNLLb1anK5kJtVJvbxH29kbgYnOWgb57nev8lY QzHczAJOMfNGdOTPnIvIghDMYvDZ+l1A+QVw7twbwamcvVaSkjKqo8+h5Ye0O8RM/MU4 YzUsSG+On9B5gkoU9rSXoB0mHDiYjELV6hBGJQze6SMVjOykLMKpUczYwITu/nfFf4Xz PG7/XGtQPFj5+SnaE6CjdRKi9bZmz5+bkXpRHMRehRns8xQS4XbHm8ng1eHsPVt4yf6M DGag== X-Gm-Message-State: AOAM532VlMVG3vpUyyIKsWoR0fMlfItVwLhdeYa1vBrG+xLH48wmZXQX diLAJ9UHn+p07FYmUrzRouw/UGEhUqW8hA== X-Google-Smtp-Source: ABdhPJwN+gKVAEcz5VrVXhEYrxHoadvjqoTJ7Rm6jCXx/nx3SxbLrp4phdUdxtC3ot25AX+P6RvGhg== X-Received: by 2002:aa7:c782:: with SMTP id n2mr67769783eds.77.1621181221835; Sun, 16 May 2021 09:07:01 -0700 (PDT) Received: from localhost.localdomain ([188.252.220.215]) by smtp.googlemail.com with ESMTPSA id e23sm1327186eds.2.2021.05.16.09.07.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 May 2021 09:07:01 -0700 (PDT) From: Robert Marko To: openwrt-devel@lists.openwrt.org Cc: Robert Marko Subject: [PATCH] mac80211: fix ATH_REG_DYNAMIC_USER_REG_HINTS Date: Sun, 16 May 2021 18:06:58 +0200 Message-Id: <20210516160658.792475-1-robimarko@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210516_170709_229128_D27BE828 X-CRM114-Status: GOOD ( 10.41 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "desiato.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: ATH_REG_DYNAMIC_USER_REG_HINTS is currently not being set as mac80211 tries to set it as m which is not possible as its boolean only. Since its used alongside user regulatory, move it to USER_REGD. This is required for ath11k to accept regulatory changes, otherwise it wont accept any changes and will simply force US. Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:52a listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [robimarko[at]gmail.com] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 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 ATH_REG_DYNAMIC_USER_REG_HINTS is currently not being set as mac80211 tries to set it as m which is not possible as its boolean only. Since its used alongside user regulatory, move it to USER_REGD. This is required for ath11k to accept regulatory changes, otherwise it wont accept any changes and will simply force US. Signed-off-by: Robert Marko --- package/kernel/mac80211/ath.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk index 2c783a93e6..8ade446ed9 100644 --- a/package/kernel/mac80211/ath.mk +++ b/package/kernel/mac80211/ath.mk @@ -36,7 +36,7 @@ ifdef CONFIG_PACKAGE_MAC80211_TRACING WIL6210_TRACING endif -config-$(call config_package,ath) += ATH_CARDS ATH_COMMON ATH_REG_DYNAMIC_USER_REG_HINTS +config-$(call config_package,ath) += ATH_CARDS ATH_COMMON config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG ATH11K_DEBUG ATH9K_STATION_STATISTICS config-$(CONFIG_PACKAGE_ATH_DFS) += ATH9K_DFS_CERTIFIED ATH10K_DFS_CERTIFIED config-$(CONFIG_PACKAGE_ATH_SPECTRAL) += ATH9K_COMMON_SPECTRAL ATH10K_SPECTRAL ATH11K_SPECTRAL @@ -47,7 +47,7 @@ config-$(call config_package,owl-loader) += ATH9K_PCI_NO_EEPROM config-$(CONFIG_TARGET_ath79) += ATH9K_AHB config-$(CONFIG_TARGET_ipq40xx) += ATH10K_AHB config-$(CONFIG_PCI) += ATH9K_PCI -config-$(CONFIG_ATH_USER_REGD) += ATH_USER_REGD +config-$(CONFIG_ATH_USER_REGD) += ATH_USER_REGD ATH_REG_DYNAMIC_USER_REG_HINTS config-$(CONFIG_ATH9K_HWRNG) += ATH9K_HWRNG config-$(CONFIG_ATH9K_SUPPORT_PCOEM) += ATH9K_PCOEM config-$(CONFIG_ATH9K_TX99) += ATH9K_TX99