Commit 1e60896f authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next 

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
parents ad667867 eea54c8e

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+7 −2
Original line number Diff line number Diff line
@@ -168,8 +168,13 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, 
		hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |

			     IEEE80211_HW_SUPPORTS_STATIC_SMPS;



	/* enable 11w if the uCode advertise */

	if (capa->flags & IWL_UCODE_TLV_FLAGS_MFP)

	/*

	 * Enable 11w if advertised by firmware and software crypto

	 * is not enabled (as the firmware will interpret some mgmt

	 * packets, so enabling it with software crypto isn't safe)

	 */

	if (priv->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_MFP &&

	    !iwlwifi_mod_params.sw_crypto)

		hw->flags |= IEEE80211_HW_MFP_CAPABLE;



	hw->sta_data_size = sizeof(struct iwl_station_priv);

drivers/net/wireless/iwlwifi/dvm/main.c

+0 −2
Original line number Diff line number Diff line
@@ -1191,8 +1191,6 @@ static void iwl_option_config(struct iwl_priv *priv) 


static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)

{

	priv->eeprom_data->sku = priv->eeprom_data->sku;



	if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE &&

	    !priv->cfg->ht_params) {

		IWL_ERR(priv, "Invalid 11n configuration\n");

drivers/net/wireless/iwlwifi/iwl-config.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ enum iwl_led_mode { 
struct iwl_base_params {

	int eeprom_size;

	int num_of_queues;	/* def: HW dependent */

	/* for iwl_apm_init() */

	/* for iwl_pcie_apm_init() */

	u32 pll_cfg_val;



	const u16 max_ll_items;

drivers/net/wireless/iwlwifi/iwl-fh.h

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(unsigned int chnl) 


#define FH_RCSR_RX_CONFIG_RBDCB_SIZE_POS	(20)

#define FH_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS	(4)

#define RX_RB_TIMEOUT	(0x10)

#define RX_RB_TIMEOUT	(0x11)



#define FH_RCSR_RX_CONFIG_CHNL_EN_PAUSE_VAL         (0x00000000)

#define FH_RCSR_RX_CONFIG_CHNL_EN_PAUSE_EOF_VAL     (0x40000000)

drivers/net/wireless/iwlwifi/pcie/drv.c

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ 


#include "iwl-trans.h"

#include "iwl-drv.h"

#include "iwl-trans.h"



#include "cfg.h"

#include "internal.h"