Add information about regulatory.db to the regulatory.bin man page, and alias the regulatory.db man page to refer to the page for regulatory.bin. Signed-off-by: Seth Forshee <seth.forshee@xxxxxxxxxxxxx> --- Makefile | 2 +- regulatory.bin.5 | 32 ++++++++++++++++++++++---------- regulatory.db.5 | 1 + 3 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 regulatory.db.5 diff --git a/Makefile b/Makefile index 1e8e84c64149..2f1ed93e0e15 100644 --- a/Makefile +++ b/Makefile @@ -126,4 +126,4 @@ install: regulatory.bin.5.gz regulatory.db.5.gz install -m 644 -t $(DESTDIR)/$(CRDA_PATH)/ regulatory.bin install -m 644 -t $(DESTDIR)/$(FIRMWARE_PATH) regulatory.db regulatory.db.p7s install -m 755 -d $(DESTDIR)/$(MANDIR)/man5/ - install -m 644 -t $(DESTDIR)/$(MANDIR)/man5/ regulatory.bin.5.gz + install -m 644 -t $(DESTDIR)/$(MANDIR)/man5/ regulatory.bin.5.gz regulatory.db.5.gz diff --git a/regulatory.bin.5 b/regulatory.bin.5 index 430c65c9ce6d..b1862cd1756d 100644 --- a/regulatory.bin.5 +++ b/regulatory.bin.5 @@ -1,6 +1,6 @@ -.TH regulatory.bin 5 "23 January 2009" "regulatory.bin" "Linux" +.TH regulatory.bin 5 "21 December 2017" "regulatory.bin" "Linux" .SH NAME -regulatory.bin \- The Linux wireless regulatory database +regulatory.bin, regulatory.db \- The Linux wireless regulatory database .ad l .in +8 @@ -9,24 +9,36 @@ regulatory.bin \- The Linux wireless regulatory database .SS .SH Description .B regulatory.bin -is the file used by the Linux wireless subsystem to keep its regulatory -database information. It is read by +and +.B regulatory.db +are the files used by the Linux wireless subsystem to keep its regulatory +database information. +.PP +.B regulatory.bin +is read by .B crda upon the Linux kernel's request for regulatory information for a specific -ISO / IEC 3166 alpha2 country code. The regulatory database is kept in -a small binary format for size and code efficiency. The +ISO / IEC 3166 alpha2 country code. +.PP +.B regulatory.db +is a newer, extensible database format which (since Linux 4.15) is read +by the kernel directly as a firmware file. + +The regulatory database is kept in a small binary format for size and code +efficiency. The .B regulatory.bin file can be parsed and read in human format by using the .B regdbdump -command. The -.B regulatory.bin -file should be updated upon regulatory changes or corrections. +command. The regulatory database files should be updated upon regulatory +changes or corrections. .SH Upkeeping The regulatory database is maintained by the community as such you are encouraged to send any corrections or updates to the -linux-wireless mailing list: +linux-wireless and wireless-regdb mailing lists: .B linux-wireless@xxxxxxxxxxxxxxx +and +.B wireless-regdb@xxxxxxxxxxxxxxxxxxx .SH SEE ALSO .BR regdbdump (8) diff --git a/regulatory.db.5 b/regulatory.db.5 new file mode 100644 index 000000000000..6c8aae374621 --- /dev/null +++ b/regulatory.db.5 @@ -0,0 +1 @@ +.so man5/regulatory.bin.5.gz -- 2.14.1