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

Commit 236c52ca authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from ath.git 

No major changes to list.
parents 7683fe01 9d5db23e

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

+2 −1
Original line number Diff line number Diff line
@@ -3860,7 +3860,8 @@ static struct ieee80211_sta_ht_cap ath10k_get_ht_cap(struct ath10k *ar) 
	ht_cap.ampdu_density = IEEE80211_HT_MPDU_DENSITY_8;

	ht_cap.cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;

	ht_cap.cap |= IEEE80211_HT_CAP_DSSSCCK40;

	ht_cap.cap |= WLAN_HT_CAP_SM_PS_STATIC << IEEE80211_HT_CAP_SM_PS_SHIFT;

	ht_cap.cap |=

		WLAN_HT_CAP_SM_PS_DISABLED << IEEE80211_HT_CAP_SM_PS_SHIFT;



	if (ar->ht_cap_info & WMI_HT_CAP_HT20_SGI)

		ht_cap.cap |= IEEE80211_HT_CAP_SGI_20;

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

+17 −21
Original line number Diff line number Diff line
@@ -487,6 +487,9 @@ static int ath10k_pci_force_wake(struct ath10k *ar) 
	unsigned long flags;

	int ret = 0;



	if (ar_pci->pci_ps)

		return ret;



	spin_lock_irqsave(&ar_pci->ps_lock, flags);



	if (!ar_pci->ps_awake) {
@@ -2480,13 +2483,11 @@ static int ath10k_pci_hif_resume(struct ath10k *ar) 
	u32 val;

	int ret = 0;



	if (ar_pci->pci_ps == 0) {

	ret = ath10k_pci_force_wake(ar);

	if (ret) {

		ath10k_err(ar, "failed to wake up target: %d\n", ret);

		return ret;

	}

	}



	/* Suspend/Resume resets the PCI configuration space, so we have to

	 * re-disable the RETRY_TIMEOUT register (0x41) to keep PCI Tx retries
@@ -2592,14 +2593,11 @@ static irqreturn_t ath10k_pci_interrupt_handler(int irq, void *arg) 
	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

	int ret;



	if (ar_pci->pci_ps == 0) {

	ret = ath10k_pci_force_wake(ar);

	if (ret) {

			ath10k_warn(ar, "failed to wake device up on irq: %d\n",

				    ret);

		ath10k_warn(ar, "failed to wake device up on irq: %d\n", ret);

		return IRQ_NONE;

	}

	}



	if (ar_pci->num_msi_intrs == 0) {

		if (!ath10k_pci_irq_pending(ar))
@@ -3071,16 +3069,14 @@ static int ath10k_pci_probe(struct pci_dev *pdev, 
		goto err_sleep;

	}



	ath10k_pci_ce_deinit(ar);

	ath10k_pci_irq_disable(ar);



	if (ar_pci->pci_ps == 0) {

	ret = ath10k_pci_force_wake(ar);

	if (ret) {

		ath10k_warn(ar, "failed to wake up device : %d\n", ret);

		goto err_free_pipes;

	}

	}



	ath10k_pci_ce_deinit(ar);

	ath10k_pci_irq_disable(ar);



	ret = ath10k_pci_init_irq(ar);

	if (ret) {

drivers/net/wireless/ath/ath9k/eeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ bool ath9k_hw_nvram_check_version(struct ath_hw *ah, int version, int minrev) 
		ath_err(common, "Bad EEPROM VER 0x%04x or REV 0x%04x\n",

			ah->eep_ops->get_eeprom_ver(ah),

			ah->eep_ops->get_eeprom_rev(ah));

		return -EINVAL;

		return false;

	}



	return true;

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+1 −1
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ void ath9k_htc_ani_work(struct work_struct *work) 
		if (longcal || shortcal)

			common->ani.caldone =

				ath9k_hw_calibrate(ah, ah->curchan,

						   ah->rxchainmask, longcal);

						ah->rxchainmask, longcal) > 0;



		ath9k_htc_ps_restore(priv);

	}

drivers/net/wireless/ath/ath9k/init.c

+1 −0
Original line number Diff line number Diff line
@@ -828,6 +828,7 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) 
	ieee80211_hw_set(hw, RX_INCLUDES_FCS);

	ieee80211_hw_set(hw, HOST_BROADCAST_PS_BUFFERING);

	ieee80211_hw_set(hw, SUPPORT_FAST_XMIT);

	ieee80211_hw_set(hw, SUPPORTS_CLONED_SKBS);



	if (ath9k_ps_enable)

		ieee80211_hw_set(hw, SUPPORTS_PS);