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

Commit 58035432 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: handle FRAME_RELEASE in MQ code 



For some reason, the FRAME_RELEASE message handling for the
default queue ended up being in the only/default queue for
non-RSS devices; fix that and handle FRAME_RELEASE properly
on the default queue for RSS devices.

Fixes: 585a6fcc ("iwlwifi: mvm: infrastructure for frame-release message")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent d3a108a4

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -967,8 +967,6 @@ static void iwl_mvm_rx(struct iwl_op_mode *op_mode, 




	if (likely(pkt->hdr.cmd == REPLY_RX_MPDU_CMD))

	if (likely(pkt->hdr.cmd == REPLY_RX_MPDU_CMD))

		iwl_mvm_rx_rx_mpdu(mvm, napi, rxb);

		iwl_mvm_rx_rx_mpdu(mvm, napi, rxb);

	else if (pkt->hdr.cmd == FRAME_RELEASE)

		iwl_mvm_rx_frame_release(mvm, napi, rxb, 0);

	else if (pkt->hdr.cmd == REPLY_RX_PHY_CMD)

	else if (pkt->hdr.cmd == REPLY_RX_PHY_CMD)

		iwl_mvm_rx_rx_phy_cmd(mvm, rxb);

		iwl_mvm_rx_rx_phy_cmd(mvm, rxb);

	else

	else
@@ -987,6 +985,8 @@ static void iwl_mvm_rx_mq(struct iwl_op_mode *op_mode, 
	else if (unlikely(pkt->hdr.group_id == DATA_PATH_GROUP &&

	else if (unlikely(pkt->hdr.group_id == DATA_PATH_GROUP &&

			  pkt->hdr.cmd == RX_QUEUES_NOTIFICATION))

			  pkt->hdr.cmd == RX_QUEUES_NOTIFICATION))

		iwl_mvm_rx_queue_notif(mvm, rxb, 0);

		iwl_mvm_rx_queue_notif(mvm, rxb, 0);

	else if (pkt->hdr.cmd == FRAME_RELEASE)

		iwl_mvm_rx_frame_release(mvm, napi, rxb, 0);

	else

	else

		iwl_mvm_rx_common(mvm, rxb, pkt);

		iwl_mvm_rx_common(mvm, rxb, pkt);

}

}