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

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

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next 



John W. Linville says:

====================
Please pull this batch of updates for the 3.14 stream!

For the mac80211 bits, Johannes says:

"This time I have uAPSD fixes since I was working on that, hwsim
improvements to make dynamic radios possible for the test suite, the
evidently long-overdue channel_change_time removal and a few other small
collected fix and improvements."

For the iwlwifi bits, Emmanuel says:

"Besides a few trivial patches, I have an important workaround for a HW
issue that has kept me busy for a long time. Along with it, a fix that
prevents an error from being printed.
Eyal fixes our behavior against SISO APs and Ilan fixes an issue with
multiple interface scenarios.
Eliad fixes an error path in our init flow.
We also have a few 'static analyzers' fix."

For the NFC bits, Samuel says:

"It includes:

* A new NFC driver for Marvell's 8897, and a few NCI fixes and
  improvements needed to support this chipset.

* An LLCP fix for how we were setting the default MIU on a p2p link. If
  there is no explicit MIU extension announced at connection time, we
  must use the default one and not the one announced at LLCP link
  establishement time.

* A pn544 EEPROM config update. Some of the currently EEPROM configured
  values are overwriting the firmware ones while other should not be set
  by the driver itself.

* Some NFC digital stack fixes and improvements. Asynchronous functions
  are better documented, RF technologies and CRC functions are set upon
  PSL_REQ reception, and a few minor bugs are fixed.

* Minor and miscelaneous pn533, mei_phy and port100 fixes."

For the ath bits, Kalle says:

"Janusz added Kconfig option for DFS. The DFS code was there already, but
after fixes to mac80211 we can now enable it.

Bartosz added a runtime firmware feature flag to disable P2P. Our 10.1
firmware branch doesn't support P2P and ath10k can now disable that. He
also added a limit for how many clients can connect to ath10k AP.

Michal fixed WEP shared authentication, in case someone still uses it.
And I added firmware debug log to help the firmware engineers."

Along with that is a small batch of ath9k updates and a few other bits
here and there.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cf84eb0b 7916a075

drivers/net/wireless/adm8211.c

+0 −1
Original line number Diff line number Diff line
@@ -1865,7 +1865,6 @@ static int adm8211_probe(struct pci_dev *pdev, 
	dev->flags = IEEE80211_HW_SIGNAL_UNSPEC;

	dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);



	dev->channel_change_time = 1000;

	dev->max_signal = 100;    /* FIXME: find better value */



	dev->queues = 1; /* ADM8211C supports more, maybe ADM8211B too */

drivers/net/wireless/at76c50x-usb.c

+0 −1
Original line number Diff line number Diff line
@@ -2112,7 +2112,6 @@ static struct at76_priv *at76_alloc_new_device(struct usb_device *udev) 
	priv->pm_period = 0;



	/* unit us */

	priv->hw->channel_change_time = 100000;



	return priv;

}

drivers/net/wireless/ath/ath.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef ATH_H

#define ATH_H



#include <linux/etherdevice.h>

#include <linux/skbuff.h>

#include <linux/if_ether.h>

#include <linux/spinlock.h>
@@ -165,6 +166,7 @@ struct ath_common { 
struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,

				u32 len,

				gfp_t gfp_mask);

bool ath_is_mybeacon(struct ath_common *common, struct ieee80211_hdr *hdr);



void ath_hw_setbssidmask(struct ath_common *common);

void ath_key_delete(struct ath_common *common, struct ieee80211_key_conf *key);

drivers/net/wireless/ath/ath10k/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -37,3 +37,10 @@ config ATH10K_TRACING 
	---help---

	  Select this to ath10k use tracing infrastructure.



config ATH10K_DFS_CERTIFIED

	bool "Atheros DFS support for certified platforms"

	depends on ATH10K && CFG80211_CERTIFICATION_ONUS

	default n

	---help---

	This option enables DFS support for initiating radiation on

	ath10k.

drivers/net/wireless/ath/ath10k/core.h

+11 −0
Original line number Diff line number Diff line
@@ -253,6 +253,9 @@ struct ath10k_vif { 
			u8 bssid[ETH_ALEN];

		} ibss;

	} u;



	u8 fixed_rate;

	u8 fixed_nss;

};



struct ath10k_vif_iter {
@@ -272,6 +275,8 @@ struct ath10k_debug { 
	struct delayed_work htt_stats_dwork;

	struct ath10k_dfs_stats dfs_stats;

	struct ath_dfs_pool_stats dfs_pool_stats;



	u32 fw_dbglog_mask;

};



enum ath10k_state {
@@ -306,6 +311,9 @@ enum ath10k_fw_features { 
	/* firmware support tx frame management over WMI, otherwise it's HTT */

	ATH10K_FW_FEATURE_HAS_WMI_MGMT_TX = 2,



	/* Firmware does not support P2P */

	ATH10K_FW_FEATURE_NO_P2P = 3,



	/* keep last */

	ATH10K_FW_FEATURE_COUNT,

};
@@ -429,6 +437,9 @@ struct ath10k { 
	struct list_head peers;

	wait_queue_head_t peer_mapping_wq;



	/* number of created peers; protected by data_lock */

	int num_peers;



	struct work_struct offchan_tx_work;

	struct sk_buff_head offchan_tx_queue;

	struct completion offchan_tx_completed;