Merge "qcacmn: Filter data packets in m_copy mode"

This commit is contained in:
Linux Build Service Account 2019-04-08 12:06:01 -07:00 • committed by Gerrit - the friendly Code Review server
commit 13da9a8463
2 changed files with 13 additions and 10 deletions

View file

@ -5903,13 +5903,16 @@ static QDF_STATUS dp_pdev_configure_monitor_rings(struct dp_pdev *pdev)
(pdev->mon_filter_mode & MON_FILTER_OTHER) ? 1 : 0;
htt_tlv_filter.fp_mgmt_filter = pdev->fp_mgmt_filter;
htt_tlv_filter.fp_ctrl_filter = pdev->fp_ctrl_filter;
if (pdev->mcopy_mode)
if (pdev->mcopy_mode) {
htt_tlv_filter.fp_data_filter = 0;
else
htt_tlv_filter.mo_data_filter = 0;
} else {
htt_tlv_filter.fp_data_filter = pdev->fp_data_filter;
htt_tlv_filter.mo_data_filter = pdev->mo_data_filter;
}
htt_tlv_filter.mo_mgmt_filter = pdev->mo_mgmt_filter;
htt_tlv_filter.mo_ctrl_filter = pdev->mo_ctrl_filter;
htt_tlv_filter.mo_data_filter = pdev->mo_data_filter;
htt_tlv_filter.offset_valid = false;
for (mac_id = 0; mac_id < NUM_RXDMA_RINGS_PER_PDEV; mac_id++) {

View file

@ -198,13 +198,6 @@ static void epping_update_ol_config(void)
static
QDF_STATUS epping_bmi_download_fw(struct ol_context *ol_ctx)
{
ol_ctx = cds_get_context(QDF_MODULE_ID_BMI);
if (!ol_ctx) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
"%s: ol_ctx is NULL", __func__);
return QDF_STATUS_E_INVAL;
}
epping_update_ol_config();
/* Initialize BMI and Download firmware */
@ -280,6 +273,13 @@ int epping_enable(struct device *parent_dev, bool rtnl_held)
tgt_info = hif_get_target_info_handle(scn);
ol_ctx = cds_get_context(QDF_MODULE_ID_BMI);
if (!ol_ctx) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
"%s: ol_ctx is NULL", __func__);
return A_ERROR;
}
if (epping_bmi_download_fw(ol_ctx) != QDF_STATUS_SUCCESS)
return A_ERROR;