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

Merge tag 'wireless-drivers-next-2021-06-16' of... 

Merge tag 'wireless-drivers-next-2021-06-16' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for v5.14

First set of patches for v5.14. Major new features are here support
WCN6855 PCI in ath11k and WoWLAN support for wcn36xx. Also smaller
fixes and cleanups all over.

ath9k

* provide STBC info in the received frames

brcmfmac

* fix setting of station info chains bitmask

* correctly report average RSSI in station info

rsi

* support for changing beacon interval in AP mode

ath11k

* support for WCN6855 PCI hardware

wcn36xx

* WoWLAN support with magic packets and GTK rekeying
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8ac9900a f39c2d1a

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

+1 −8
Original line number Diff line number Diff line
@@ -442,14 +442,7 @@ static int ath10k_ahb_resource_init(struct ath10k *ar) 


	pdev = ar_ahb->pdev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		ath10k_err(ar, "failed to get memory resource\n");

		ret = -ENXIO;

		goto out;

	}



	ar_ahb->mem = devm_ioremap_resource(&pdev->dev, res);

	ar_ahb->mem = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(ar_ahb->mem)) {

		ath10k_err(ar, "mem ioremap error\n");

		ret = PTR_ERR(ar_ahb->mem);

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

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ struct ath10k_fw_stats_pdev { 
	s32 underrun;

	u32 hw_paused;

	s32 tx_abort;

	s32 mpdus_requed;

	s32 mpdus_requeued;

	u32 tx_ko;

	u32 data_rc;

	u32 self_triggers;

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

+2 −2
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ static const char ath10k_gstrings_stats[][ETH_GSTRING_LEN] = { 
	"d_tx_ppdu_reaped",

	"d_tx_fifo_underrun",

	"d_tx_ppdu_abort",

	"d_tx_mpdu_requed",

	"d_tx_mpdu_requeued",

	"d_tx_excessive_retries",

	"d_tx_hw_rate",

	"d_tx_dropped_sw_retries",
@@ -1205,7 +1205,7 @@ void ath10k_debug_get_et_stats(struct ieee80211_hw *hw, 
	data[i++] = pdev_stats->hw_reaped;

	data[i++] = pdev_stats->underrun;

	data[i++] = pdev_stats->tx_abort;

	data[i++] = pdev_stats->mpdus_requed;

	data[i++] = pdev_stats->mpdus_requeued;

	data[i++] = pdev_stats->tx_ko;

	data[i++] = pdev_stats->data_rc;

	data[i++] = pdev_stats->sw_retry_failure;

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

+2 −2
Original line number Diff line number Diff line
@@ -1283,8 +1283,8 @@ struct htt_dbg_stats_wal_tx_stats { 
	/* Num PPDUs cleaned up in TX abort */

	__le32 tx_abort;



	/* Num MPDUs requed by SW */

	__le32 mpdus_requed;

	/* Num MPDUs requeued by SW */

	__le32 mpdus_requeued;



	/* excessive retries */

	__le32 tx_ko;

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

+0 −2
Original line number Diff line number Diff line
@@ -1787,7 +1787,6 @@ static bool ath10k_htt_rx_h_frag_pn_check(struct ath10k *ar, 
	struct ath10k_peer *peer;

	union htt_rx_pn_t *last_pn, new_pn = {0};

	struct ieee80211_hdr *hdr;

	bool more_frags;

	u8 tid, frag_number;

	u32 seq;
@@ -1805,7 +1804,6 @@ static bool ath10k_htt_rx_h_frag_pn_check(struct ath10k *ar, 


	last_pn = &peer->frag_tids_last_pn[tid];

	new_pn.pn48 = ath10k_htt_rx_h_get_pn(ar, skb, offset, enctype);

	more_frags = ieee80211_has_morefrags(hdr->frame_control);

	frag_number = le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG;

	seq = (__le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4;