Merge tag 'mac80211-for-davem-2020-06-08' of... (6b1ad5a3) · Commits · 戴 / test

Documentation/networking/mac80211-injection.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -101,6 +101,6 @@ interface), along the following lines:::

		You can also find a link to a complete inject application here:

		http://wireless.kernel.org/en/users/Documentation/packetspammer
		https://wireless.wiki.kernel.org/en/users/Documentation/packetspammer

		Andy Green <andy@warmcat.com>

+3 −3

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ regulatory infrastructure works.

		More up to date information can be obtained at the project's web page:

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

		Keeping regulatory domains in userspace
		---------------------------------------
		@@ -37,7 +37,7 @@ expected regulatory domains will be respected by the kernel.
		A currently available userspace agent which can accomplish this
		is CRDA - central regulatory domain agent. Its documented here:

		http://wireless.kernel.org/en/developers/Regulatory/CRDA
		https://wireless.wiki.kernel.org/en/developers/Regulatory/CRDA

		Essentially the kernel will send a udev event when it knows
		it needs a new regulatory domain. A udev rule can be put in place
		@@ -58,7 +58,7 @@ Who asks for regulatory domains?

		Users can use iw:

		http://wireless.kernel.org/en/users/Documentation/iw
		https://wireless.wiki.kernel.org/en/users/Documentation/iw

		An example::

+3 −2

Original line number	Diff line number	Diff line
		@@ -5075,7 +5075,8 @@ struct cfg80211_cqm_config;
		* by cfg80211 on change_interface
		* @mgmt_registrations: list of registrations for management frames
		* @mgmt_registrations_lock: lock for the list
		* @mgmt_registrations_update_wk: update work to defer from atomic context
		* @mgmt_registrations_need_update: mgmt registrations were updated,
		* need to propagate the update to the driver
		* @mtx: mutex used to lock data in this struct, may be used by drivers
		* and some API functions require it held
		* @beacon_interval: beacon interval used on this device for transmitting
		@@ -5121,7 +5122,7 @@ struct wireless_dev {

		struct list_head mgmt_registrations;
		spinlock_t mgmt_registrations_lock;
		struct work_struct mgmt_registrations_update_wk;
		u8 mgmt_registrations_need_update:1;

		struct mutex mtx;

+1 −1

Original line number	Diff line number	Diff line
		@@ -794,7 +794,7 @@
		* various triggers. These triggers can be configured through this
		* command with the %NL80211_ATTR_WOWLAN_TRIGGERS attribute. For
		* more background information, see
		* http://wireless.kernel.org/en/users/Documentation/WoWLAN.
		* https://wireless.wiki.kernel.org/en/users/Documentation/WoWLAN.
		* The @NL80211_CMD_SET_WOWLAN command can also be used as a notification
		* from the driver reporting the wakeup reason. In this case, the
		* @NL80211_ATTR_WOWLAN_TRIGGERS attribute will contain the reason

+2 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,8 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata,
		ret = IEEE80211_STA_DISABLE_HT \|
		IEEE80211_STA_DISABLE_VHT \|
		IEEE80211_STA_DISABLE_HE;
		else
		ret = 0;
		vht_chandef = *chandef;
		goto out;
		}