Commit f39c2d1a authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git patches for v5.14. Major changes:

ath11k

* support for WCN6855 PCI hardware

wcn36xx

* WoWLAN support with magic packets and GTK rekeying
parents 31453804 8f78caa2

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/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;

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

+1 −0
Original line number Diff line number Diff line
@@ -5592,6 +5592,7 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, 


	if (arvif->nohwcrypt &&

	    !test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) {

		ret = -EINVAL;

		ath10k_warn(ar, "cryptmode module param needed for sw crypto\n");

		goto err;

	}

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

+10 −4
Original line number Diff line number Diff line
@@ -3685,10 +3685,12 @@ static int ath10k_pci_probe(struct pci_dev *pdev, 
			ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS);

		if (bus_params.chip_id != 0xffffffff) {

			if (!ath10k_pci_chip_is_supported(pdev->device,

							  bus_params.chip_id))

							  bus_params.chip_id)) {

				ret = -ENODEV;

				goto err_unsupported;

			}

		}

	}



	ret = ath10k_pci_chip_reset(ar);

	if (ret) {
@@ -3697,11 +3699,15 @@ static int ath10k_pci_probe(struct pci_dev *pdev, 
	}



	bus_params.chip_id = ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS);

	if (bus_params.chip_id == 0xffffffff)

	if (bus_params.chip_id == 0xffffffff) {

		ret = -ENODEV;

		goto err_unsupported;

	}



	if (!ath10k_pci_chip_is_supported(pdev->device, bus_params.chip_id))

		goto err_free_irq;

	if (!ath10k_pci_chip_is_supported(pdev->device, bus_params.chip_id)) {

		ret = -ENODEV;

		goto err_unsupported;

	}



	ret = ath10k_core_register(ar, &bus_params);

	if (ret) {

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

+0 −1
Original line number Diff line number Diff line
@@ -235,7 +235,6 @@ u16 ath10k_pci_hif_get_free_queue_number(struct ath10k *ar, u8 pipe); 
void ath10k_pci_hif_power_down(struct ath10k *ar);

int ath10k_pci_alloc_pipes(struct ath10k *ar);

void ath10k_pci_free_pipes(struct ath10k *ar);

void ath10k_pci_free_pipes(struct ath10k *ar);

void ath10k_pci_rx_replenish_retry(struct timer_list *t);

void ath10k_pci_ce_deinit(struct ath10k *ar);

void ath10k_pci_init_napi(struct ath10k *ar);