Merge tag 'mac80211-next-for-davem-2017-01-13' of git://git.kernel.org/pub/scm/linux...

Johannes Berg says:

====================
For 4.11, we seem to have more than in the past few releases:
 * socket owner support for connections, so when the wifi
   manager (e.g. wpa_supplicant) is killed, connections are
   torn down - wpa_supplicant is critical to managing certain
   operations, and can opt in to this where applicable
 * minstrel & minstrel_ht updates to be more efficient (time and space)
 * set wifi_acked/wifi_acked_valid for skb->destructor use in the
   kernel, which was already available to userspace
 * don't indicate new mesh peers that might be used if there's no
   room to add them
 * multicast-to-unicast support in mac80211, for better medium usage
   (since unicast frames can use *much* higher rates, by ~3 orders of
   magnitude)
 * add API to read channel (frequency) limitations from DT
 * add infrastructure to allow randomizing public action frames for
   MAC address privacy (still requires driver support)
 * many cleanups and small improvements/fixes across the board
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc Documentation/driver-api/80211/cfg80211.rst
index b1e149ea6feeb9debed0f51208033eeee35219f4,0000000000000000000000000000000000000000..eca534ab617259a63bdf0d63f6a14319dedc7c0d
mode 100644,000000..100644
--- 1/Documentation/driver-api/80211/cfg80211.rst
--- /dev/null
+++ b/Documentation/driver-api/80211/cfg80211.rst
@@@ -1,345 -1,0 +1,348 @@@
 +==================
 +cfg80211 subsystem
 +==================
 +
 +Device registration
 +===================
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :doc: Device registration
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_channel_flags
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_channel
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_rate_flags
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_rate
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_sta_ht_cap
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_supported_band
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_signal_type
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wiphy_params_flags
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wiphy_flags
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wiphy
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wireless_dev
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wiphy_new
 +
++.. kernel-doc:: include/net/cfg80211.h
++   :functions: wiphy_read_of_freq_limits
++
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wiphy_register
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wiphy_unregister
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wiphy_free
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wiphy_name
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wiphy_dev
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wiphy_priv
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: priv_to_wiphy
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: set_wiphy_dev
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wdev_priv
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_iface_limit
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_iface_combination
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_check_combinations
 +
 +Actions and configuration
 +=========================
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :doc: Actions and configuration
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_ops
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: vif_params
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: key_params
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: survey_info_flags
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: survey_info
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_beacon_data
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_ap_settings
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: station_parameters
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: rate_info_flags
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: rate_info
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: station_info
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: monitor_flags
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: mpath_info_flags
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: mpath_info
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: bss_parameters
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_txq_params
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_crypto_settings
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_auth_request
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_assoc_request
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_deauth_request
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_disassoc_request
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_ibss_params
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_connect_params
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_pmksa
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_rx_mlme_mgmt
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_auth_timeout
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_rx_assoc_resp
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_assoc_timeout
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_tx_mlme_mgmt
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_ibss_joined
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_connect_result
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_connect_bss
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_connect_timeout
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_roamed
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_disconnected
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_ready_on_channel
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_remain_on_channel_expired
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_new_sta
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_rx_mgmt
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_mgmt_tx_status
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_cqm_rssi_notify
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_cqm_pktloss_notify
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_michael_mic_failure
 +
 +Scanning and BSS list handling
 +==============================
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :doc: Scanning and BSS list handling
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_ssid
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_scan_request
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_scan_done
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_bss
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_inform_bss
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_inform_bss_frame_data
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_inform_bss_data
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_unlink_bss
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_find_ie
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_bss_get_ie
 +
 +Utility functions
 +=================
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :doc: Utility functions
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_channel_to_frequency
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_frequency_to_channel
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_get_channel
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_get_response_rate
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_hdrlen
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_get_hdrlen_from_skb
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_radiotap_iterator
 +
 +Data path helpers
 +=================
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :doc: Data path helpers
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_data_to_8023
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_data_from_8023
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: ieee80211_amsdu_to_8023s
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_classify8021d
 +
 +Regulatory enforcement infrastructure
 +=====================================
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :doc: Regulatory enforcement infrastructure
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: regulatory_hint
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wiphy_apply_custom_regulatory
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: freq_reg_info
 +
 +RFkill integration
 +==================
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :doc: RFkill integration
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wiphy_rfkill_set_hw_state
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wiphy_rfkill_start_polling
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: wiphy_rfkill_stop_polling
 +
 +Test mode
 +=========
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :doc: Test mode
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_testmode_alloc_reply_skb
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_testmode_reply
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_testmode_alloc_event_skb
 +
 +.. kernel-doc:: include/net/cfg80211.h
 +   :functions: cfg80211_testmode_event

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/mac80211/sta_info.c
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

diff --cc net/wireless/Makefile
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge