Commit e78d7877 authored by Benjamin Berg's avatar Benjamin Berg Committed by Johannes Berg
Browse files

wifi: iwlwifi: mvm: include link ID when releasing frames 



When releasing frames from the reorder buffer, the link ID was not
included in the RX status information. This subsequently led mac80211 to
drop the frame. Change it so that the link information is set
immediately when possible so that it doesn't not need to be filled in
anymore when submitting the frame to mac80211.

Fixes: b8a85a1d ("wifi: iwlwifi: mvm: rxmq: report link ID to mac80211")
Signed-off-by: default avatarBenjamin Berg <benjamin.berg@intel.com>
Tested-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240320232419.bbbd5e9bfe80.Iec1bf5c884e371f7bc5ea2534ed9ea8d3f2c0bf6@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 19d82bde

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

+8 −12
Original line number Diff line number Diff line
@@ -236,21 +236,13 @@ static void iwl_mvm_add_rtap_sniffer_config(struct iwl_mvm *mvm, 
static void iwl_mvm_pass_packet_to_mac80211(struct iwl_mvm *mvm,

					    struct napi_struct *napi,

					    struct sk_buff *skb, int queue,

					    struct ieee80211_sta *sta,

					    struct ieee80211_link_sta *link_sta)

					    struct ieee80211_sta *sta)

{

	if (unlikely(iwl_mvm_check_pn(mvm, skb, queue, sta))) {

		kfree_skb(skb);

		return;

	}



	if (sta && sta->valid_links && link_sta) {

		struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);



		rx_status->link_valid = 1;

		rx_status->link_id = link_sta->link_id;

	}



	ieee80211_rx_napi(mvm->hw, sta, skb, napi);

}
@@ -588,7 +580,7 @@ static void iwl_mvm_release_frames(struct iwl_mvm *mvm, 
		while ((skb = __skb_dequeue(skb_list))) {

			iwl_mvm_pass_packet_to_mac80211(mvm, napi, skb,

							reorder_buf->queue,

							sta, NULL /* FIXME */);

							sta);

			reorder_buf->num_stored--;

		}

	}
@@ -2213,6 +2205,11 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi, 
			if (IS_ERR(sta))

				sta = NULL;

			link_sta = rcu_dereference(mvm->fw_id_to_link_sta[id]);



			if (sta && sta->valid_links && link_sta) {

				rx_status->link_valid = 1;

				rx_status->link_id = link_sta->link_id;

			}

		}

	} else if (!is_multicast_ether_addr(hdr->addr2)) {

		/*
@@ -2356,8 +2353,7 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi, 
		    !(desc->amsdu_info & IWL_RX_MPDU_AMSDU_LAST_SUBFRAME))

			rx_status->flag |= RX_FLAG_AMSDU_MORE;



		iwl_mvm_pass_packet_to_mac80211(mvm, napi, skb, queue, sta,

						link_sta);

		iwl_mvm_pass_packet_to_mac80211(mvm, napi, skb, queue, sta);

	}

out:

	rcu_read_unlock();