Return-path: Received: from s3.sipsolutions.net ([5.9.151.49]:34122 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751624AbbLKQpX (ORCPT ); Fri, 11 Dec 2015 11:45:23 -0500 From: Johannes Berg To: linux-wireless@vger.kernel.org, wireless-regdb@lists.infradead.org Cc: Janusz Dziedzic , j@w1.fi, Johannes Berg Subject: [PATCH] regulatory: fix world regdomain Date: Fri, 11 Dec 2015 17:45:19 +0100 Message-Id: <1449852319-27189-1-git-send-email-johannes@sipsolutions.net> (sfid-20151211_174526_698895_CB90B65E) Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Johannes Berg Back in 2012, in commit 6d87df6f9657 ("regdb: allow 40 MHz on world roaming channels 12/13") I evidently broke the world regulatory data to the point where it was always discarded by the kernel because the 40 MHz bandwidth doesn't fit into the rule range. Around the same time, I updated the in-kernel regulatory domain with the same mistake, but unlike the userspace data, the in-kernel data isn't actually checked for validity. The end result was that the (inconsequentially invalid) data in the kernel was always used because the userspace data was rejected. Fix this by changing the rule to 20 MHz and adding the AUTO-BW flag. It seems that Janusz had made a similar change in commit 5cfc8073ce35 ("wireless-regdb: set AUTO bandwidth for world regulatory"), but it was reverted for unknown reasons a little less than half a year later (commit cfa3734b11b2). The kernel uses very similar invalid rules, but it never checks them for validity and just uses them, so HT40- ends up getting enabled on these channels. Thus, when the kernel requests the world regdomain from userspace, gets the invalid data and rejects it, it falls back to using the built-in data which is very similar and not validated. I've tested this now, and the ruleset is now accepted by the kernel and results in the correct data. This also means that Jouni's 160 MHz fixes were inconsequentialy and only the corresponding kernel changes could have been used. Signed-off-by: Johannes Berg --- db.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db.txt b/db.txt index a6eb033db25d..13cc7ada23d9 100644 --- a/db.txt +++ b/db.txt @@ -2,7 +2,7 @@ country 00: (2402 - 2472 @ 40), (20) # Channel 12 - 13. - (2457 - 2482 @ 40), (20), NO-IR + (2457 - 2482 @ 20), (20), NO-IR, AUTO-BW # Channel 14. Only JP enables this and for 802.11b only (2474 - 2494 @ 20), (20), NO-IR, NO-OFDM # Channel 36 - 48 -- 2.6.2