Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d90b9e29 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-fixes

parents 6bb7aabf 622ebe99

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2799,7 +2799,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta, 
		info->control.rates[0].flags = 0;

		info->control.rates[0].flags = 0;

	}

	}

	info->control.rates[0].idx = rate_idx;

	info->control.rates[0].idx = rate_idx;



	info->control.rates[0].count = 1;

}

}





static void *rs_alloc_sta(void *priv_rate, struct ieee80211_sta *sta,

static void *rs_alloc_sta(void *priv_rate, struct ieee80211_sta *sta,

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1378,7 +1378,7 @@ static void iwlagn_chain_noise_reset(struct iwl_priv *priv) 
	struct iwl_chain_noise_data *data = &priv->chain_noise_data;

	struct iwl_chain_noise_data *data = &priv->chain_noise_data;

	int ret;

	int ret;





	if (!(priv->calib_disabled & IWL_CHAIN_NOISE_CALIB_DISABLED))

	if (priv->calib_disabled & IWL_CHAIN_NOISE_CALIB_DISABLED)

		return;

		return;





	if ((data->state == IWL_CHAIN_NOISE_ALIVE) &&

	if ((data->state == IWL_CHAIN_NOISE_ALIVE) &&

drivers/net/wireless/iwlwifi/iwl-drv.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1000,10 +1000,12 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
	 */

	 */

	if (load_module) {

	if (load_module) {

		err = request_module("%s", op->name);

		err = request_module("%s", op->name);

#ifdef CONFIG_IWLWIFI_OPMODE_MODULAR

		if (err)

		if (err)

			IWL_ERR(drv,

			IWL_ERR(drv,

				"failed to load module %s (error %d), is dynamic loading enabled?\n",

				"failed to load module %s (error %d), is dynamic loading enabled?\n",

				op->name, err);

				op->name, err);

#endif

	}

	}

	return;

	return;

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -2546,6 +2546,7 @@ static void rs_get_rate(void *mvm_r, struct ieee80211_sta *sta, void *mvm_sta, 
		info->control.rates[0].flags = 0;

		info->control.rates[0].flags = 0;

	}

	}

	info->control.rates[0].idx = rate_idx;

	info->control.rates[0].idx = rate_idx;

	info->control.rates[0].count = 1;

}

}





static void *rs_alloc_sta(void *mvm_rate, struct ieee80211_sta *sta,

static void *rs_alloc_sta(void *mvm_rate, struct ieee80211_sta *sta,

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -180,7 +180,8 @@ static void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm, 
		tx_cmd->tx_flags |= cpu_to_le32(TX_CMD_FLG_STA_RATE);

		tx_cmd->tx_flags |= cpu_to_le32(TX_CMD_FLG_STA_RATE);

		return;

		return;

	} else if (ieee80211_is_back_req(fc)) {

	} else if (ieee80211_is_back_req(fc)) {

		tx_cmd->tx_flags |= cpu_to_le32(TX_CMD_FLG_STA_RATE);

		tx_cmd->tx_flags |=

			cpu_to_le32(TX_CMD_FLG_ACK | TX_CMD_FLG_BAR);

	}

	}





	/* HT rate doesn't make sense for a non data frame */

	/* HT rate doesn't make sense for a non data frame */