Hi Johannes, Am 09.10.2017 um 11:50 schrieb Johannes Berg: > From: Johannes Berg <johannes.berg@xxxxxxxxx> > > Parsing and building C structures from a regdb is no longer needed > since the "firmware" file (regulatory.db) can be linked into the > kernel image to achieve the same effect. > > Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> > --- > Documentation/networking/regulatory.txt | 22 +---- > net/wireless/Kconfig | 24 +---- > net/wireless/Makefile | 6 -- > net/wireless/db.txt | 17 ---- > net/wireless/genregdb.awk | 158 -------------------------------- > net/wireless/reg.c | 39 -------- > net/wireless/regdb.h | 23 ----- > 7 files changed, 3 insertions(+), 286 deletions(-) > delete mode 100644 net/wireless/db.txt > delete mode 100644 net/wireless/genregdb.awk > delete mode 100644 net/wireless/regdb.h > > diff --git a/Documentation/networking/regulatory.txt b/Documentation/networking/regulatory.txt > index 46c8d8b1cc66..381e5b23d61d 100644 > --- a/Documentation/networking/regulatory.txt > +++ b/Documentation/networking/regulatory.txt > @@ -200,23 +200,5 @@ Then in some part of your code after your wiphy has been registered: > Statically compiled regulatory database > --------------------------------------- > > -In most situations the userland solution using CRDA as described > -above is the preferred solution. However in some cases a set of > -rules built into the kernel itself may be desirable. To account > -for this situation, a configuration option has been provided > -(i.e. CONFIG_CFG80211_INTERNAL_REGDB). With this option enabled, > -the wireless database information contained in net/wireless/db.txt is > -used to generate a data structure encoded in net/wireless/regdb.c. > -That option also enables code in net/wireless/reg.c which queries > -the data in regdb.c as an alternative to using CRDA. > - > -The file net/wireless/db.txt should be kept up-to-date with the db.txt > -file available in the git repository here: > - > - git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git > - > -Again, most users in most situations should be using the CRDA package > -provided with their distribution, and in most other situations users > -should be building and using CRDA on their own rather than using > -this option. If you are not absolutely sure that you should be using > -CONFIG_CFG80211_INTERNAL_REGDB then _DO_NOT_USE_IT_. > +When a database should be fixed into the kernel, it can be provided as a > +firmware file at build time that is then linked into the kernel. > Is there already an example regulatory.db file available? And is there already a tool chain for creating the new format? I don't see any corresponding commit on https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/ for your change. Or can I simply use the regulartory.bin as firmware file?
Attachment:
smime.p7s
Description: S/MIME Cryptographic Signature
