Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next (d91a48cb) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/wireless/iwlwifi/Kconfig

+1 −2

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ config IWLWIFI
		config IWLWIFI_LEDS
		bool
		depends on IWLWIFI
		depends on LEDS_CLASS
		depends on LEDS_CLASS=y \|\| LEDS_CLASS=IWLWIFI
		select LEDS_TRIGGERS
		select MAC80211_LEDS
		default y
		@@ -128,7 +128,6 @@ config IWLWIFI_DEBUG_EXPERIMENTAL_UCODE
		Enable use of experimental ucode for testing and debugging.

		config IWLWIFI_DEVICE_TRACING

		bool "iwlwifi device access tracing"
		depends on IWLWIFI
		depends on EVENT_TRACING

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@ int iwl_send_calib_results(struct iwl_priv *priv)
		{
		struct iwl_host_cmd hcmd = {
		.id = REPLY_PHY_CALIBRATION_CMD,
		.flags = CMD_SYNC,
		};
		struct iwl_calib_result *res;

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -1481,7 +1481,7 @@ static ssize_t iwl_dbgfs_ucode_bt_stats_read(struct file *file,

		/* make request to uCode to retrieve statistics information */
		mutex_lock(&priv->mutex);
		ret = iwl_send_statistics_request(priv, CMD_SYNC, false);
		ret = iwl_send_statistics_request(priv, 0, false);
		mutex_unlock(&priv->mutex);

		if (ret)
		@@ -1868,7 +1868,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,

		/* make request to uCode to retrieve statistics information */
		mutex_lock(&priv->mutex);
		iwl_send_statistics_request(priv, CMD_SYNC, true);
		iwl_send_statistics_request(priv, 0, true);
		mutex_unlock(&priv->mutex);

		return count;
		@@ -2188,7 +2188,6 @@ static int iwl_cmd_echo_test(struct iwl_priv *priv)
		struct iwl_host_cmd cmd = {
		.id = REPLY_ECHO,
		.len = { 0 },
		.flags = CMD_SYNC,
		};

		ret = iwl_dvm_send_cmd(priv, &cmd);
		@@ -2320,7 +2319,7 @@ static ssize_t iwl_dbgfs_fw_restart_write(struct file *file,
		mutex_lock(&priv->mutex);

		/* take the return value to make compiler happy - it will fail anyway */
		ret = iwl_dvm_send_cmd_pdu(priv, REPLY_ERROR, CMD_SYNC, 0, NULL);
		ret = iwl_dvm_send_cmd_pdu(priv, REPLY_ERROR, 0, 0, NULL);

		mutex_unlock(&priv->mutex);

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -417,7 +417,6 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
		struct iwl_host_cmd hcmd = {
		.id = REPLY_CHANNEL_SWITCH,
		.len = { sizeof(cmd), },
		.flags = CMD_SYNC,
		.data = { &cmd, },
		};

		@@ -579,7 +578,6 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
		struct iwl_host_cmd hcmd = {
		.id = REPLY_CHANNEL_SWITCH,
		.len = { sizeof(*cmd), },
		.flags = CMD_SYNC,
		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,
		};
		int err;

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

+7 −10

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ int iwlagn_send_tx_power(struct iwl_priv *priv)
		else
		tx_ant_cfg_cmd = REPLY_TX_POWER_DBM_CMD;

		return iwl_dvm_send_cmd_pdu(priv, tx_ant_cfg_cmd, CMD_SYNC,
		return iwl_dvm_send_cmd_pdu(priv, tx_ant_cfg_cmd, 0,
		sizeof(tx_power_cmd), &tx_power_cmd);
		}

		@@ -141,7 +141,6 @@ int iwlagn_txfifo_flush(struct iwl_priv *priv, u32 scd_q_msk)
		struct iwl_host_cmd cmd = {
		.id = REPLY_TXFIFO_FLUSH,
		.len = { sizeof(struct iwl_txfifo_flush_cmd), },
		.flags = CMD_SYNC,
		.data = { &flush_cmd, },
		};

		@@ -333,12 +332,12 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv)
		memcpy(&bt_cmd_v2.basic, &basic,
		sizeof(basic));
		ret = iwl_dvm_send_cmd_pdu(priv, REPLY_BT_CONFIG,
		CMD_SYNC, sizeof(bt_cmd_v2), &bt_cmd_v2);
		0, sizeof(bt_cmd_v2), &bt_cmd_v2);
		} else {
		memcpy(&bt_cmd_v1.basic, &basic,
		sizeof(basic));
		ret = iwl_dvm_send_cmd_pdu(priv, REPLY_BT_CONFIG,
		CMD_SYNC, sizeof(bt_cmd_v1), &bt_cmd_v1);
		0, sizeof(bt_cmd_v1), &bt_cmd_v1);
		}
		if (ret)
		IWL_ERR(priv, "failed to send BT Coex Config\n");
		@@ -1044,7 +1043,6 @@ int iwlagn_send_patterns(struct iwl_priv *priv,
		struct iwl_host_cmd cmd = {
		.id = REPLY_WOWLAN_PATTERNS,
		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,
		.flags = CMD_SYNC,
		};
		int i, err;

		@@ -1201,7 +1199,6 @@ int iwlagn_suspend(struct iwl_priv priv, struct cfg80211_wowlan wowlan)
		if (key_data.use_rsc_tsc) {
		struct iwl_host_cmd rsc_tsc_cmd = {
		.id = REPLY_WOWLAN_TSC_RSC_PARAMS,
		.flags = CMD_SYNC,
		.data[0] = key_data.rsc_tsc,
		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,
		.len[0] = sizeof(*key_data.rsc_tsc),
		@@ -1215,7 +1212,7 @@ int iwlagn_suspend(struct iwl_priv priv, struct cfg80211_wowlan wowlan)
		if (key_data.use_tkip) {
		ret = iwl_dvm_send_cmd_pdu(priv,
		REPLY_WOWLAN_TKIP_PARAMS,
		CMD_SYNC, sizeof(tkip_cmd),
		0, sizeof(tkip_cmd),
		&tkip_cmd);
		if (ret)
		goto out;
		@@ -1231,20 +1228,20 @@ int iwlagn_suspend(struct iwl_priv priv, struct cfg80211_wowlan wowlan)

		ret = iwl_dvm_send_cmd_pdu(priv,
		REPLY_WOWLAN_KEK_KCK_MATERIAL,
		CMD_SYNC, sizeof(kek_kck_cmd),
		0, sizeof(kek_kck_cmd),
		&kek_kck_cmd);
		if (ret)
		goto out;
		}
		}

		ret = iwl_dvm_send_cmd_pdu(priv, REPLY_D3_CONFIG, CMD_SYNC,
		ret = iwl_dvm_send_cmd_pdu(priv, REPLY_D3_CONFIG, 0,
		sizeof(d3_cfg_cmd), &d3_cfg_cmd);
		if (ret)
		goto out;

		ret = iwl_dvm_send_cmd_pdu(priv, REPLY_WOWLAN_WAKEUP_FILTER,
		CMD_SYNC, sizeof(wakeup_filter_cmd),
		0, sizeof(wakeup_filter_cmd),
		&wakeup_filter_cmd);
		if (ret)
		goto out;