cfg80211: reg: remove support for built-in regdb (c8c240e2) · Commits · 戴 / test

Documentation/networking/regulatory.txt

+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.

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		regdb.c

+1 −23

Original line number	Diff line number	Diff line
		@@ -140,30 +140,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
		depends on CFG80211
		help

+0 −6

Original line number	Diff line number	Diff line
		@@ -14,11 +14,5 @@ cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o trace.o ocb.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)

		$(obj)/regdb.c: $(src)/db.txt $(src)/genregdb.awk
		@$(AWK) -f $(srctree)/$(src)/genregdb.awk < $< > $@

		clean-files := regdb.c

deleted100644 → 0

+0 −17

Original line number	Diff line number	Diff line
		#
		# This file is a placeholder to prevent accidental build breakage if someone
		# enables CONFIG_CFG80211_INTERNAL_REGDB. Almost no one actually needs to
		# enable that build option.
		#
		# You should be using CRDA instead. It is even better if you use the CRDA
		# package provided by your distribution, since they will probably keep it
		# up-to-date on your behalf.
		#
		# If you _really_ intend to use CONFIG_CFG80211_INTERNAL_REGDB then you will
		# need to replace this file with one containing appropriately formatted
		# regulatory rules that cover the regulatory domains you will be using. Your
		# best option is to extract the db.txt file from the wireless-regdb git
		# repository:
		#
		# git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.git
		#