Commit 51052dd2 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2017-08-30' of... 

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

Last set of iwlwifi patches for 4.14

* Fix a queue hang problem due to 11w behavior
* Fix a warning caused by a too long debug print
* Bump API number to the latest version we support
parents d081a16d d7a5b3e9

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

+2 −2
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL8000_UCODE_API_MAX	33

#define IWL8265_UCODE_API_MAX	33

#define IWL8000_UCODE_API_MAX	34

#define IWL8265_UCODE_API_MAX	34



/* Lowest firmware API version supported */

#define IWL8000_UCODE_API_MIN	22

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

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL9000_UCODE_API_MAX	33

#define IWL9000_UCODE_API_MAX	34



/* Lowest firmware API version supported */

#define IWL9000_UCODE_API_MIN	30

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

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL_A000_UCODE_API_MAX	33

#define IWL_A000_UCODE_API_MAX	34



/* Lowest firmware API version supported */

#define IWL_A000_UCODE_API_MIN	24

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

+7 −2
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, 
		prev_reg_rule_flags = reg_rule_flags;



		IWL_DEBUG_DEV(dev, IWL_DL_LAR,

			      "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n",

			      "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x)\n",

			      center_freq,

			      band == NL80211_BAND_5GHZ ? "5.2" : "2.4",

			      CHECK_AND_PRINT_I(VALID),
@@ -930,7 +930,12 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, 
			      CHECK_AND_PRINT_I(80MHZ),

			      CHECK_AND_PRINT_I(160MHZ),

			      CHECK_AND_PRINT_I(DC_HIGH),

			      ch_flags, reg_rule_flags,

			      ch_flags);

		IWL_DEBUG_DEV(dev, IWL_DL_LAR,

			      "Ch. %d [%sGHz] reg_flags 0x%x: %s\n",

			      center_freq,

			      band == NL80211_BAND_5GHZ ? "5.2" : "2.4",

			      reg_rule_flags,

			      ((ch_flags & NVM_CHANNEL_ACTIVE) &&

			       !(ch_flags & NVM_CHANNEL_RADAR))

					 ? "Ad-Hoc" : "");

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

+5 −4
Original line number Diff line number Diff line
@@ -810,10 +810,11 @@ static void iwl_mvm_mac_tx(struct ieee80211_hw *hw, 
	    !test_bit(IWL_MVM_STATUS_ROC_AUX_RUNNING, &mvm->status))

		goto drop;



	/* treat non-bufferable MMPDUs as broadcast if sta is sleeping */

	if (unlikely(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER &&

	/* treat non-bufferable MMPDUs on AP interfaces as broadcast */

	if ((info->control.vif->type == NL80211_IFTYPE_AP ||

	     info->control.vif->type == NL80211_IFTYPE_ADHOC) &&

	    ieee80211_is_mgmt(hdr->frame_control) &&

		     !ieee80211_is_bufferable_mmpdu(hdr->frame_control)))

	    !ieee80211_is_bufferable_mmpdu(hdr->frame_control))

		sta = NULL;



	if (sta) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE