Commit 8a185006 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git 

This is to fix some conflicts in iwlwifi.

Conflicts:
	drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
	drivers/net/wireless/intel/iwlwifi/mvm/scan.c
parents 238ad2dd 034fdd4a

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

+1 −1
Original line number Diff line number Diff line
@@ -1158,7 +1158,7 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name, 
			}



			ath10k_dbg_dump(ar, ATH10K_DBG_BOOT, "features", "",

					ar->running_fw->fw_file.fw_features,

					fw_file->fw_features,

					sizeof(fw_file->fw_features));

			break;

		case ATH10K_FW_IE_FW_IMAGE:

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

+0 −1
Original line number Diff line number Diff line
@@ -1905,7 +1905,6 @@ static void ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb) 
			return;

		}

	}

	ath10k_htt_rx_msdu_buff_replenish(htt);

}



static void ath10k_htt_rx_tx_fetch_resp_id_confirm(struct ath10k *ar,

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

+1 −1
Original line number Diff line number Diff line
@@ -708,10 +708,10 @@ static int ath10k_peer_create(struct ath10k *ar, 


	peer = ath10k_peer_find(ar, vdev_id, addr);

	if (!peer) {

		spin_unlock_bh(&ar->data_lock);

		ath10k_warn(ar, "failed to find peer %pM on vdev %i after creation\n",

			    addr, vdev_id);

		ath10k_wmi_peer_delete(ar, vdev_id, addr);

		spin_unlock_bh(&ar->data_lock);

		return -ENOENT;

	}

drivers/net/wireless/ath/ath9k/reg.h

+4 −4
Original line number Diff line number Diff line
@@ -1122,12 +1122,12 @@ enum { 
#define AR9300_NUM_GPIO                          16

#define AR9330_NUM_GPIO				 16

#define AR9340_NUM_GPIO				 23

#define AR9462_NUM_GPIO				 10

#define AR9462_NUM_GPIO				 14

#define AR9485_NUM_GPIO				 12

#define AR9531_NUM_GPIO				 18

#define AR9550_NUM_GPIO				 24

#define AR9561_NUM_GPIO				 23

#define AR9565_NUM_GPIO				 12

#define AR9565_NUM_GPIO				 14

#define AR9580_NUM_GPIO				 16

#define AR7010_NUM_GPIO                          16
@@ -1139,12 +1139,12 @@ enum { 
#define AR9300_GPIO_MASK			 0x0000F4FF

#define AR9330_GPIO_MASK			 0x0000F4FF

#define AR9340_GPIO_MASK			 0x0000000F

#define AR9462_GPIO_MASK			 0x000003FF

#define AR9462_GPIO_MASK			 0x00003FFF

#define AR9485_GPIO_MASK			 0x00000FFF

#define AR9531_GPIO_MASK			 0x0000000F

#define AR9550_GPIO_MASK			 0x0000000F

#define AR9561_GPIO_MASK			 0x0000000F

#define AR9565_GPIO_MASK			 0x00000FFF

#define AR9565_GPIO_MASK			 0x00003FFF

#define AR9580_GPIO_MASK			 0x0000F4FF

#define AR7010_GPIO_MASK			 0x0000FFFF

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+4 −4
Original line number Diff line number Diff line
@@ -3886,7 +3886,7 @@ static int iwl_mvm_mac_get_survey(struct ieee80211_hw *hw, int idx, 
	if (idx != 0)

		return -ENOENT;



	if (fw_has_capa(&mvm->fw->ucode_capa,

	if (!fw_has_capa(&mvm->fw->ucode_capa,

			 IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))

		return -ENOENT;
@@ -3938,7 +3938,7 @@ static void iwl_mvm_mac_sta_statistics(struct ieee80211_hw *hw, 
		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL_AVG);

	}



	if (fw_has_capa(&mvm->fw->ucode_capa,

	if (!fw_has_capa(&mvm->fw->ucode_capa,

			 IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))

		return;