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

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

+17 −7

Original line number	Diff line number	Diff line
		@@ -1151,13 +1151,6 @@ int iwlagn_rx_reply_tx(struct iwl_priv priv, struct iwl_rx_cmd_buffer rxb,
		next_reclaimed = ssn;
		}

		if (tid != IWL_TID_NON_QOS) {
		priv->tid_data[sta_id][tid].next_reclaimed =
		next_reclaimed;
		IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d\n",
		next_reclaimed);
		}

		iwl_trans_reclaim(priv->trans, txq_id, ssn, &skbs);

		iwlagn_check_ratid_empty(priv, sta_id, tid);
		@@ -1208,11 +1201,28 @@ int iwlagn_rx_reply_tx(struct iwl_priv priv, struct iwl_rx_cmd_buffer rxb,
		if (!is_agg)
		iwlagn_non_agg_tx_status(priv, ctx, hdr->addr1);

		/*
		* W/A for FW bug - the seq_ctl isn't updated when the
		* queues are flushed. Fetch it from the packet itself
		*/
		if (!is_agg && status == TX_STATUS_FAIL_FIFO_FLUSHED) {
		next_reclaimed = le16_to_cpu(hdr->seq_ctrl);
		next_reclaimed =
		SEQ_TO_SN(next_reclaimed + 0x10);
		}

		is_offchannel_skb =
		(info->flags & IEEE80211_TX_CTL_TX_OFFCHAN);
		freed++;
		}

		if (tid != IWL_TID_NON_QOS) {
		priv->tid_data[sta_id][tid].next_reclaimed =
		next_reclaimed;
		IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d\n",
		next_reclaimed);
		}

		WARN_ON(!is_agg && freed != 1);

		/*

+1 −0

Original line number	Diff line number	Diff line
		@@ -1166,6 +1166,7 @@ static irqreturn_t iwl_pcie_isr(int irq, void *data)
		else if (test_bit(STATUS_INT_ENABLED, &trans_pcie->status) &&
		!trans_pcie->inta)
		iwl_enable_interrupts(trans);
		return IRQ_HANDLED;

		none:
		/* re-enable interrupts here since we don't have anything to service. */