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

Commit 028f43bc authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2017-04-18' of... 

Merge tag 'mac80211-next-for-davem-2017-04-18' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
My last pull request has been a while, we now have:
 * connection quality monitoring with multiple thresholds
 * support for FILS shared key authentication offload
 * pre-CAC regulatory compliance - only ETSI allows this
 * sanity check for some rate confusion that hit ChromeOS
   (but nobody else uses it, evidently)
 * some documentation updates
 * lots of cleanups
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0ef9059d bbf67e45

Documentation/driver-api/80211/cfg80211.rst

+9 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
cfg80211 subsystem

==================



.. kernel-doc:: include/net/cfg80211.h

   :doc: Introduction



Device registration

===================
@@ -179,6 +182,12 @@ Actions and configuration 
.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_ibss_joined



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_connect_resp_params



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_connect_done



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_connect_result

drivers/net/wireless/admtek/adm8211.c

+2 −0
Original line number Diff line number Diff line
@@ -1917,6 +1917,8 @@ static int adm8211_probe(struct pci_dev *pdev, 


	dev->wiphy->bands[NL80211_BAND_2GHZ] = &priv->band;



	wiphy_ext_feature_set(dev->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);



	err = ieee80211_register_hw(dev);

	if (err) {

		printk(KERN_ERR "%s (adm8211): Cannot register device\n",

drivers/net/wireless/ath/ar5523/ar5523.c

+2 −0
Original line number Diff line number Diff line
@@ -1689,6 +1689,8 @@ static int ar5523_probe(struct usb_interface *intf, 
	if (error)

		goto out_cancel_rx_cmd;



	wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);



	usb_set_intfdata(intf, hw);



	error = ieee80211_register_hw(hw);

drivers/net/wireless/ath/ath10k/mac.c

+2 −0
Original line number Diff line number Diff line
@@ -8267,6 +8267,8 @@ int ath10k_mac_register(struct ath10k *ar) 
	ar->hw->wiphy->cipher_suites = cipher_suites;

	ar->hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);



	wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);



	ret = ieee80211_register_hw(ar->hw);

	if (ret) {

		ath10k_err(ar, "failed to register ieee80211: %d\n", ret);

drivers/net/wireless/ath/ath5k/base.c

+2 −0
Original line number Diff line number Diff line
@@ -2564,6 +2564,8 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops) 


	hw->extra_tx_headroom = 2;



	wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);



	/*

	 * Mark the device as detached to avoid processing

	 * interrupts until setup is complete.