Merge "qca-wifi: Qcn9000 changes for rx flow identification"

dp/wifi3.0/dp_rx_fst.c

@@ -303,7 +303,7 @@ QDF_STATUS dp_rx_flow_add_entry(struct dp_pdev *pdev,
 
 	flow.reo_destination_handler = HAL_RX_FSE_REO_DEST_FT;
 	flow.fse_metadata = rx_flow_info->fse_metadata;
-	fse->hal_rx_fse = hal_rx_flow_setup_fse(fst->hal_rx_fst,
+	fse->hal_rx_fse = hal_rx_flow_setup_fse(soc->hal_soc, fst->hal_rx_fst,
 						fse->flow_id, &flow);
 	if (qdf_unlikely(!fse->hal_rx_fse)) {
 		dp_err("Unable to alloc FSE entry");

dp/wifi3.0/dp_rx_tag.c

@@ -135,8 +135,7 @@ dp_rx_update_protocol_tag(struct dp_soc *soc, struct dp_vdev *vdev,
 
 	cce_match = true;
 	/* Get the cce_metadata from RX MSDU TLV */
-	cce_metadata = (hal_rx_msdu_cce_metadata_get(soc->hal_soc, rx_tlv_hdr) &
-			RX_MSDU_END_16_CCE_METADATA_MASK);
+	cce_metadata = hal_rx_msdu_cce_metadata_get(soc->hal_soc, rx_tlv_hdr);
 	/*
 	 * Received CCE metadata should be within the
 	 * valid limits