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

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

Merge ath-current from ath.git 

ath.git fixes for 4.8. Major changes:

ath10k

* fix racy rx status retrieval from htt context
* QCA9887 support is not experimental anymore, remove the warning message

ath9k

* fix regression with led GPIOs
* fix AR5416 GPIO access warning
parents ded89912 e34f2ff4

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

+5 −5
Original line number Diff line number Diff line
@@ -1525,7 +1525,7 @@ static void ath10k_htt_rx_h_filter(struct ath10k *ar, 
static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt)

{

	struct ath10k *ar = htt->ar;

	static struct ieee80211_rx_status rx_status;

	struct ieee80211_rx_status *rx_status = &htt->rx_status;

	struct sk_buff_head amsdu;

	int ret;
@@ -1549,11 +1549,11 @@ static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt) 
		return ret;

	}



	ath10k_htt_rx_h_ppdu(ar, &amsdu, &rx_status, 0xffff);

	ath10k_htt_rx_h_ppdu(ar, &amsdu, rx_status, 0xffff);

	ath10k_htt_rx_h_unchain(ar, &amsdu, ret > 0);

	ath10k_htt_rx_h_filter(ar, &amsdu, &rx_status);

	ath10k_htt_rx_h_mpdu(ar, &amsdu, &rx_status);

	ath10k_htt_rx_h_deliver(ar, &amsdu, &rx_status);

	ath10k_htt_rx_h_filter(ar, &amsdu, rx_status);

	ath10k_htt_rx_h_mpdu(ar, &amsdu, rx_status);

	ath10k_htt_rx_h_deliver(ar, &amsdu, rx_status);



	return 0;

}

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

+0 −1
Original line number Diff line number Diff line
@@ -3162,7 +3162,6 @@ static int ath10k_pci_probe(struct pci_dev *pdev, 
		pci_hard_reset = ath10k_pci_qca988x_chip_reset;

		break;

	case QCA9887_1_0_DEVICE_ID:

		dev_warn(&pdev->dev, "QCA9887 support is still experimental, there are likely bugs. You have been warned.\n");

		hw_rev = ATH10K_HW_QCA9887;

		pci_ps = false;

		pci_soft_reset = ath10k_pci_warm_reset;

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

+2 −2
Original line number Diff line number Diff line
@@ -2482,6 +2482,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) 
		return -EINVAL;

	}



	ath9k_gpio_cap_init(ah);



	if (AR_SREV_9485(ah) ||

	    AR_SREV_9285(ah) ||

	    AR_SREV_9330(ah) ||
@@ -2531,8 +2533,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) 
	else

		pCap->hw_caps &= ~ATH9K_HW_CAP_HT;



	ath9k_gpio_cap_init(ah);



	if (AR_SREV_9160_10_OR_LATER(ah) || AR_SREV_9100(ah))

		pCap->rts_aggr_limit = ATH_AMPDU_LIMIT_MAX;

	else

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

+7 −2
Original line number Diff line number Diff line
@@ -718,9 +718,12 @@ static int ath9k_start(struct ieee80211_hw *hw) 
	if (!ath_complete_reset(sc, false))

		ah->reset_power_on = false;



	if (ah->led_pin >= 0)

	if (ah->led_pin >= 0) {

		ath9k_hw_set_gpio(ah, ah->led_pin,

				  (ah->config.led_active_high) ? 1 : 0);

		ath9k_hw_gpio_request_out(ah, ah->led_pin, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_OUTPUT);

	}



	/*

	 * Reset key cache to sane defaults (all entries cleared) instead of
@@ -864,9 +867,11 @@ static void ath9k_stop(struct ieee80211_hw *hw) 


	spin_lock_bh(&sc->sc_pcu_lock);



	if (ah->led_pin >= 0)

	if (ah->led_pin >= 0) {

		ath9k_hw_set_gpio(ah, ah->led_pin,

				  (ah->config.led_active_high) ? 0 : 1);

		ath9k_hw_gpio_request_in(ah, ah->led_pin, NULL);

	}



	ath_prepare_reset(sc);