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

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

Merge tag 'wireless-drivers-next-for-davem-2016-12-01' of... 

Merge tag 'wireless-drivers-next-for-davem-2016-12-01' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for 4.10

Major changes:

rsi

* filter rx frames
* configure tx power
* make it possible to select antenna
* support 802.11d

brcmfmac

* cleanup of scheduled scan code
* support for bcm43341 chipset with different chip id
* support rev6 of PCIe device interface

ath10k

* add spectral scan support for QCA6174 and QCA9377 families
* show used tx bitrate with 10.4 firmware

wil6210

* add power save mode support
* add abort scan functionality
* add support settings retry limit for short frames

bcma

* add Dell Inspiron 3148
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4f4f907a d5fb3a13

drivers/bcma/host_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ static const struct pci_device_id bcma_pci_bridge_tbl[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4360) },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_BROADCOM, 0x4365, PCI_VENDOR_ID_DELL, 0x0016) },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_BROADCOM, 0x4365, PCI_VENDOR_ID_DELL, 0x0018) },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_BROADCOM, 0x4365, PCI_VENDOR_ID_FOXCONN, 0xe092) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a0) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },

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

+5 −3
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ static const char *const ath10k_core_fw_feature_str[] = { 
	[ATH10K_FW_FEATURE_PEER_FLOW_CONTROL] = "peer-flow-ctrl",

	[ATH10K_FW_FEATURE_BTCOEX_PARAM] = "btcoex-param",

	[ATH10K_FW_FEATURE_SKIP_NULL_FUNC_WAR] = "skip-null-func-war",

	[ATH10K_FW_FEATURE_ALLOWS_MESH_BCAST] = "allows-mesh-bcast",

};



static unsigned int ath10k_core_get_fw_feature_str(char *buf,
@@ -1536,7 +1537,7 @@ static void ath10k_core_restart(struct work_struct *work) 
	switch (ar->state) {

	case ATH10K_STATE_ON:

		ar->state = ATH10K_STATE_RESTARTING;

		ath10k_hif_stop(ar);

		ath10k_halt(ar);

		ath10k_scan_finish(ar);

		ieee80211_restart_hw(ar->hw);

		break;
@@ -1857,7 +1858,7 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, 
		goto err_wmi_detach;

	}



	status = ath10k_htt_tx_alloc(&ar->htt);

	status = ath10k_htt_tx_start(&ar->htt);

	if (status) {

		ath10k_err(ar, "failed to alloc htt tx: %d\n", status);

		goto err_wmi_detach;
@@ -2052,7 +2053,7 @@ void ath10k_core_stop(struct ath10k *ar) 
		ath10k_wait_for_suspend(ar, WMI_PDEV_SUSPEND_AND_DISABLE_INTR);



	ath10k_hif_stop(ar);

	ath10k_htt_tx_free(&ar->htt);

	ath10k_htt_tx_stop(&ar->htt);

	ath10k_htt_rx_free(&ar->htt);

	ath10k_wmi_detach(ar);

}
@@ -2385,6 +2386,7 @@ void ath10k_core_destroy(struct ath10k *ar) 
	destroy_workqueue(ar->workqueue_aux);



	ath10k_debug_destroy(ar);

	ath10k_htt_tx_destroy(&ar->htt);

	ath10k_wmi_free_host_mem(ar);

	ath10k_mac_destroy(ar);

}

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

+24 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ struct ath10k_sta { 
	u32 nss;

	u32 smps;

	u16 peer_id;

	struct rate_info txrate;



	struct work_struct update_wk;
@@ -562,6 +563,13 @@ enum ath10k_fw_features { 
	 */

	ATH10K_FW_FEATURE_SKIP_NULL_FUNC_WAR = 15,



	/* Firmware allow other BSS mesh broadcast/multicast frames without

	 * creating monitor interface. Appropriate rxfilters are programmed for

	 * mesh vdev by firmware itself. This feature flags will be used for

	 * not creating monitor vdev while configuring mesh node.

	 */

	ATH10K_FW_FEATURE_ALLOWS_MESH_BCAST = 16,



	/* keep last */

	ATH10K_FW_FEATURE_COUNT,

};
@@ -693,6 +701,21 @@ struct ath10k_fw_components { 
	struct ath10k_fw_file fw_file;

};



struct ath10k_per_peer_tx_stats {

	u32	succ_bytes;

	u32	retry_bytes;

	u32	failed_bytes;

	u8	ratecode;

	u8	flags;

	u16	peer_id;

	u16	succ_pkts;

	u16	retry_pkts;

	u16	failed_pkts;

	u16	duration;

	u32	reserved1;

	u32	reserved2;

};



struct ath10k {

	struct ath_common ath_common;

	struct ieee80211_hw *hw;
@@ -906,6 +929,7 @@ struct ath10k { 


	struct ath10k_thermal thermal;

	struct ath10k_wow wow;

	struct ath10k_per_peer_tx_stats peer_tx_stats;



	/* NAPI */

	struct net_device napi_dev;

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

+13 −0
Original line number Diff line number Diff line
@@ -77,6 +77,19 @@ void ath10k_sta_statistics(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


	sinfo->rx_duration = arsta->rx_duration;

	sinfo->filled |= 1ULL << NL80211_STA_INFO_RX_DURATION;



	if (!arsta->txrate.legacy && !arsta->txrate.nss)

		return;



	if (arsta->txrate.legacy) {

		sinfo->txrate.legacy = arsta->txrate.legacy;

	} else {

		sinfo->txrate.mcs = arsta->txrate.mcs;

		sinfo->txrate.nss = arsta->txrate.nss;

		sinfo->txrate.bw = arsta->txrate.bw;

	}

	sinfo->txrate.flags = arsta->txrate.flags;

	sinfo->filled |= 1ULL << NL80211_STA_INFO_TX_BITRATE;

}



static ssize_t ath10k_dbg_sta_read_aggr_mode(struct file *file,

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

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ static const enum htt_t2h_msg_type htt_10_4_t2h_msg_types[] = { 
				HTT_T2H_MSG_TYPE_STATS_NOUPLOAD,

	[HTT_10_4_T2H_MSG_TYPE_TX_MODE_SWITCH_IND] =

				HTT_T2H_MSG_TYPE_TX_MODE_SWITCH_IND,

	[HTT_10_4_T2H_MSG_TYPE_PEER_STATS] =

				HTT_T2H_MSG_TYPE_PEER_STATS,

};



int ath10k_htt_connect(struct ath10k_htt *htt)