From: Kalle Valo <kvalo@codeaurora.org>
Date: Sun, 10 Jul 2016 18:02:20 +0000 (+0300)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
X-Git-Tag: v4.8-rc1~140^2~121^2~1
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=8a185006bce519738fe06350aa8d5195e9a1da62

Merge git://git./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
---

8a185006bce519738fe06350aa8d5195e9a1da62
diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 53761c4f7a0f,18a8474b5760..6d6064534d59
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@@ -3933,13 -3898,8 +3933,13 @@@ static void iwl_mvm_mac_sta_statistics(
  	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
  	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
  
 +	if (mvmsta->avg_energy) {
 +		sinfo->signal_avg = mvmsta->avg_energy;
 +		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL_AVG);
 +	}
 +
- 	if (fw_has_capa(&mvm->fw->ucode_capa,
- 			IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))
+ 	if (!fw_has_capa(&mvm->fw->ucode_capa,
+ 			 IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))
  		return;
  
  	/* if beacon filtering isn't on mac80211 does it anyway */