Commit 222b048c 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

parents 375e875c 499892f2

drivers/net/wireless/iwlwifi/dvm/agn.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -172,7 +172,7 @@ int iwl_calib_set(struct iwl_priv *priv, 
		  const struct iwl_calib_hdr *cmd, int len);

		  const struct iwl_calib_hdr *cmd, int len);

void iwl_calib_free_results(struct iwl_priv *priv);

void iwl_calib_free_results(struct iwl_priv *priv);

int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,

int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,

			    char **buf, bool display);

			    char **buf);

int iwlagn_hw_valid_rtc_data_addr(u32 addr);

int iwlagn_hw_valid_rtc_data_addr(u32 addr);





/* lib */

/* lib */

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

+7 −9
Original line number Original line Diff line number Diff line
@@ -2237,15 +2237,13 @@ static ssize_t iwl_dbgfs_log_event_read(struct file *file, 
					 size_t count, loff_t *ppos)

					 size_t count, loff_t *ppos)

{

{

	struct iwl_priv *priv = file->private_data;

	struct iwl_priv *priv = file->private_data;

	char *buf;

	char *buf = NULL;

	int pos = 0;

	ssize_t ret;

	ssize_t ret = -ENOMEM;





	ret = pos = iwl_dump_nic_event_log(priv, true, &buf, true);

	ret = iwl_dump_nic_event_log(priv, true, &buf);

	if (buf) {

	if (ret > 0)

		ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);

		ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret);

	kfree(buf);

	kfree(buf);

	}

	return ret;

	return ret;

}

}
@@ -2269,7 +2267,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file, 
	if (sscanf(buf, "%d", &event_log_flag) != 1)

	if (sscanf(buf, "%d", &event_log_flag) != 1)

		return -EFAULT;

		return -EFAULT;

	if (event_log_flag == 1)

	if (event_log_flag == 1)

		iwl_dump_nic_event_log(priv, true, NULL, false);

		iwl_dump_nic_event_log(priv, true, NULL);





	return count;

	return count;

}

}

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -1795,7 +1795,7 @@ static int iwl_print_last_event_logs(struct iwl_priv *priv, u32 capacity, 
#define DEFAULT_DUMP_EVENT_LOG_ENTRIES (20)

#define DEFAULT_DUMP_EVENT_LOG_ENTRIES (20)





int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,

int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,

			    char **buf, bool display)

			    char **buf)

{

{

	u32 base;       /* SRAM byte address of event log header */

	u32 base;       /* SRAM byte address of event log header */

	u32 capacity;   /* event log capacity in # entries */

	u32 capacity;   /* event log capacity in # entries */
@@ -1866,7 +1866,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log, 
		size);

		size);





#ifdef CONFIG_IWLWIFI_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

	if (display) {

	if (buf) {

		if (full_log)

		if (full_log)

			bufsz = capacity * 48;

			bufsz = capacity * 48;

		else

		else
@@ -1962,7 +1962,7 @@ static void iwl_nic_error(struct iwl_op_mode *op_mode) 
		priv->fw->fw_version);

		priv->fw->fw_version);





	iwl_dump_nic_error_log(priv);

	iwl_dump_nic_error_log(priv);

	iwl_dump_nic_event_log(priv, false, NULL, false);

	iwl_dump_nic_event_log(priv, false, NULL);





	iwlagn_fw_error(priv, false);

	iwlagn_fw_error(priv, false);

}

}

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -695,6 +695,7 @@ void iwl_clear_ucode_stations(struct iwl_priv *priv, 
void iwl_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx)

void iwl_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx)

{

{

	struct iwl_addsta_cmd sta_cmd;

	struct iwl_addsta_cmd sta_cmd;

	static const struct iwl_link_quality_cmd zero_lq = {};

	struct iwl_link_quality_cmd lq;

	struct iwl_link_quality_cmd lq;

	int i;

	int i;

	bool found = false;

	bool found = false;
@@ -733,6 +734,8 @@ void iwl_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 
				else

				else

					memcpy(&lq, priv->stations[i].lq,

					memcpy(&lq, priv->stations[i].lq,

					       sizeof(struct iwl_link_quality_cmd));

					       sizeof(struct iwl_link_quality_cmd));



				if (!memcmp(&lq, &zero_lq, sizeof(lq)))

					send_lq = true;

					send_lq = true;

			}

			}

			spin_unlock_bh(&priv->sta_lock);

			spin_unlock_bh(&priv->sta_lock);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -207,7 +207,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 




	hw->wiphy->hw_version = mvm->trans->hw_id;

	hw->wiphy->hw_version = mvm->trans->hw_id;





	if (iwlwifi_mod_params.power_save)

	if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM)

		hw->wiphy->flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;

		hw->wiphy->flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;

	else

	else

		hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;

		hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;