Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes (cb4ec37d) · Commits · e / devices / android_kernel_sony_msm8994

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1079,6 +1079,8 @@ static void iwlagn_set_tx_status(struct iwl_priv *priv,
	{		{
	u16 status = le16_to_cpu(tx_resp->status.status);		u16 status = le16_to_cpu(tx_resp->status.status);

			info->flags &= ~IEEE80211_TX_CTL_AMPDU;

	info->status.rates[0].count = tx_resp->failure_frame + 1;		info->status.rates[0].count = tx_resp->failure_frame + 1;
	info->flags \|= iwl_tx_status_to_mac80211(status);		info->flags \|= iwl_tx_status_to_mac80211(status);
	iwlagn_hwrate_to_tx_control(priv, le32_to_cpu(tx_resp->rate_n_flags),		iwlagn_hwrate_to_tx_control(priv, le32_to_cpu(tx_resp->rate_n_flags),