Merge branch 'ath-current' into ath-next (3cd32dde) · Commits · 戴 / test

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -1520,7 +1520,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, num_msdus;

		@@ -1545,11 +1545,11 @@ static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt)
		}

		num_msdus = skb_queue_len(&amsdu);
		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 num_msdus;
		}

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -3181,7 +3181,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

+12 −6

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

		@@ -1154,6 +1159,7 @@ void ath9k_calculate_summary_state(struct ath_softc *sc,
		bool changed = (iter_data.primary_sta != ctx->primary_sta);

		if (iter_data.primary_sta) {
		iter_data.primary_beacon_vif = iter_data.primary_sta;
		iter_data.beacons = true;
		ath9k_set_assoc_state(sc, iter_data.primary_sta,
		changed);
		@@ -1563,13 +1569,13 @@ static int ath9k_sta_state(struct ieee80211_hw *hw,
		struct ath_common *common = ath9k_hw_common(sc->sc_ah);
		int ret = 0;

		if (old_state == IEEE80211_STA_AUTH &&
		new_state == IEEE80211_STA_ASSOC) {
		if (old_state == IEEE80211_STA_NOTEXIST &&
		new_state == IEEE80211_STA_NONE) {
		ret = ath9k_sta_add(hw, vif, sta);
		ath_dbg(common, CONFIG,
		"Add station: %pM\n", sta->addr);
		} else if (old_state == IEEE80211_STA_ASSOC &&
		new_state == IEEE80211_STA_AUTH) {
		} else if (old_state == IEEE80211_STA_NONE &&
		new_state == IEEE80211_STA_NOTEXIST) {
		ret = ath9k_sta_remove(hw, vif, sta);
		ath_dbg(common, CONFIG,
		"Remove station: %pM\n", sta->addr);

drivers/net/wireless/marvell/mwifiex/11n_aggr.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,8 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,

		do {
		/* Check if AMSDU can accommodate this MSDU */
		if (skb_tailroom(skb_aggr) < (skb_src->len + LLC_SNAP_LEN))
		if ((skb_aggr->len + skb_src->len + LLC_SNAP_LEN) >
		adapter->tx_buf_size)
		break;

		skb_src = skb_dequeue(&pra_list->skb_head);

Admin message