Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1362ad85 authored by Siddharth Gupta's avatar Siddharth Gupta
Browse files

cfg80211: reg: Reset to upstream



Reset net/wireless to upstream commit 460f3fd8 ("Merge
android11-5.4.61+ (d240b692) into msm-5.4"). This change re-introduces
removal of support for built-in regdb by commit 7478b988 ("Revert
"cfg80211: reg: remove support for built-in regdb"").

Change-Id: Id6e87eb589d246448e005d0daed1edd57473e880
Signed-off-by: default avatarSiddharth Gupta <sidgup@codeaurora.org>
parent 508a6c80
Loading
Loading
Loading
Loading
+2 −20
Original line number Diff line number Diff line
@@ -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.
+0 −1
Original line number Diff line number Diff line
regdb.c
shipped-certs.c
extra-certs.c
+1 −23
Original line number Diff line number Diff line
@@ -176,30 +176,8 @@ config CFG80211_DEBUGFS

	  If unsure, say N.

config CFG80211_INTERNAL_REGDB
	bool "use statically compiled regulatory rules database" if EXPERT
	default n
	depends on CFG80211
	help
	  This option generates an internal data structure representing
	  the wireless regulatory rules described in net/wireless/db.txt
	  and includes code to query that database. This is an alternative
	  to using CRDA for defining regulatory rules for the kernel.

	  Using this option requires some parsing of the db.txt at build time,
	  the parser will be upkept with the latest wireless-regdb updates but
	  older wireless-regdb formats will be ignored. The parser may later
	  be replaced to avoid issues with conflicts on versions of
	  wireless-regdb.

	  For details see:

	  http://wireless.kernel.org/en/developers/Regulatory

	  Most distributions have a CRDA package. So if unsure, say N.

config CFG80211_CRDA_SUPPORT
	bool "support CRDA" if CFG80211_INTERNAL_REGDB
	bool "support CRDA" if EXPERT
	default y
	help
	  You should enable this option unless you know for sure you have no
+1 −7
Original line number Diff line number Diff line
@@ -16,16 +16,9 @@ cfg80211-y += pmsr.o
cfg80211-$(CONFIG_OF) += of.o
cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o
cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o
cfg80211-$(CONFIG_CFG80211_INTERNAL_REGDB) += regdb.o

CFLAGS_trace.o := -I$(src)

clean-files += shipped-certs.c extra-certs.c
$(obj)/regdb.c: $(src)/db.txt $(src)/genregdb.awk
	@$(AWK) -f $(srctree)/$(src)/genregdb.awk < $< > $@

clean-files := regdb.c

cfg80211-$(CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS) += shipped-certs.o
ifneq ($(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR),)
cfg80211-y += extra-certs.o
@@ -64,3 +57,4 @@ $(obj)/extra-certs.c: $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR:"%"=%) \
	      echo 'unsigned int extra_regdb_certs_len = sizeof(extra_regdb_certs);'; \
	  ) > $@)

clean-files += shipped-certs.c extra-certs.c

net/wireless/db.txt

deleted100644 → 0
+0 −1545

File deleted.

Preview size limit exceeded, changes collapsed.

Loading