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

Merge tag 'iwlwifi-next-for-kalle-2018-05-30' of... 

Merge tag 'iwlwifi-next-for-kalle-2018-05-30' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Final batch of iwlwifi patches for 4.18

* Some bugzilla fixes;
* Some kernel warning fixes;
* Fix for an (ETSI) WMM limits bug;
* Fix for a Bluetooth coexistence problem on 9000 devices;
* Fix for an interoperability bug related to block-ack sessions;
parents 06895b16 50624782

drivers/net/wireless/intel/iwlwifi/cfg/6000.c

+1 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ const struct iwl_cfg iwl6000_3agn_cfg = { 
	.eeprom_params = &iwl6000_eeprom_params,

	.ht_params = &iwl6000_ht_params,

	.led_mode = IWL_LED_BLINK,

	.csr = &iwl_csr_v1,

};



MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));

drivers/net/wireless/intel/iwlwifi/cfg/9000.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
	.base_params = &iwl9000_base_params,				\

	.led_mode = IWL_LED_RF_STATE,					\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_9000,		\

	.non_shared_ant = ANT_A,					\

	.non_shared_ant = ANT_B,					\

	.dccm_offset = IWL9000_DCCM_OFFSET,				\

	.dccm_len = IWL9000_DCCM_LEN,					\

	.dccm2_offset = IWL9000_DCCM2_OFFSET,				\

drivers/net/wireless/intel/iwlwifi/fw/api/rx.h

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ enum iwl_rx_mpdu_status { 
	IWL_RX_MPDU_STATUS_MIC_OK		= BIT(6),

	IWL_RX_MPDU_RES_STATUS_TTAK_OK		= BIT(7),

	IWL_RX_MPDU_STATUS_SEC_MASK		= 0x7 << 8,

	IWL_RX_MPDU_STATUS_SEC_UNKNOWN		= IWL_RX_MPDU_STATUS_SEC_MASK,

	IWL_RX_MPDU_STATUS_SEC_NONE		= 0x0 << 8,

	IWL_RX_MPDU_STATUS_SEC_WEP		= 0x1 << 8,

	IWL_RX_MPDU_STATUS_SEC_CCM		= 0x2 << 8,

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+1 −2
Original line number Diff line number Diff line
@@ -1025,8 +1025,7 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, 
			continue;



		copy_rd->reg_rules[i].wmm_rule = d_wmm +

			(regd->reg_rules[i].wmm_rule - s_wmm) /

			sizeof(struct ieee80211_wmm_rule);

			(regd->reg_rules[i].wmm_rule - s_wmm);

	}



out:

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

+3 −5
Original line number Diff line number Diff line
@@ -2685,7 +2685,7 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, 


	mutex_lock(&mvm->mutex);

	/* track whether or not the station is associated */

	mvm_sta->associated = new_state >= IEEE80211_STA_ASSOC;

	mvm_sta->sta_state = new_state;



	if (old_state == IEEE80211_STA_NOTEXIST &&

	    new_state == IEEE80211_STA_NONE) {
@@ -2737,8 +2737,7 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, 
			iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);

		}



		iwl_mvm_rs_rate_init(mvm, sta, mvmvif->phy_ctxt->channel->band,

				     true);

		iwl_mvm_rs_rate_init(mvm, sta, mvmvif->phy_ctxt->channel->band);

		ret = iwl_mvm_update_sta(mvm, vif, sta);

	} else if (old_state == IEEE80211_STA_ASSOC &&

		   new_state == IEEE80211_STA_AUTHORIZED) {
@@ -2754,8 +2753,7 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, 
		/* enable beacon filtering */

		WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif, 0));



		iwl_mvm_rs_rate_init(mvm, sta, mvmvif->phy_ctxt->channel->band,

				     false);

		iwl_mvm_rs_rate_init(mvm, sta, mvmvif->phy_ctxt->channel->band);



		ret = 0;

	} else if (old_state == IEEE80211_STA_AUTHORIZED &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE