summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/hdd/inc/wlan_hdd_power.h1
-rw-r--r--core/hdd/src/wlan_hdd_assoc.c8
-rw-r--r--core/hdd/src/wlan_hdd_power.c87
-rw-r--r--core/hdd/src/wlan_hdd_wext.c50
-rw-r--r--core/mac/inc/sir_api.h6
-rw-r--r--core/mac/src/sys/legacy/src/utils/src/mac_trace.c1
-rw-r--r--core/sme/inc/sme_api.h2
-rw-r--r--core/sme/src/common/sme_api.c49
-rw-r--r--core/wma/inc/wma_types.h2
9 files changed, 4 insertions, 202 deletions
diff --git a/core/hdd/inc/wlan_hdd_power.h b/core/hdd/inc/wlan_hdd_power.h
index 815a9f90c28c..e7b43ccdff53 100644
--- a/core/hdd/inc/wlan_hdd_power.h
+++ b/core/hdd/inc/wlan_hdd_power.h
@@ -160,7 +160,6 @@ enum suspend_resume_state {
QDF_STATUS hdd_wlan_shutdown(void);
QDF_STATUS hdd_wlan_re_init(void);
-void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter);
QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable);
void hdd_conf_hostoffload(hdd_adapter_t *pAdapter, bool fenable);
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index 66ef50acf29c..669410496c75 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -4686,14 +4686,10 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
/* Check if Mcast/Bcast Filters are set, if yes clear the filters here */
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
if (pHddCtx->hdd_mcastbcast_filter_set == true) {
- hdd_conf_mcastbcast_filter(pHddCtx, false);
-
- if (true ==
- pHddCtx->sus_res_mcastbcast_filter_valid) {
+ if (pHddCtx->sus_res_mcastbcast_filter_valid) {
pHddCtx->configuredMcastBcastFilter =
pHddCtx->sus_res_mcastbcast_filter;
- pHddCtx->
- sus_res_mcastbcast_filter_valid =
+ pHddCtx->sus_res_mcastbcast_filter_valid =
false;
}
diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c
index 3a63ba7b6e7c..91766cc09829 100644
--- a/core/hdd/src/wlan_hdd_power.c
+++ b/core/hdd/src/wlan_hdd_power.c
@@ -936,93 +936,6 @@ QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable)
}
}
-/**
- * hdd_mcbc_filter_modification() - MCBC Filter Modifier
- * @pHddCtx: Global Hdd Context
- * @pMcBcFilter: Multicast/Broadcast filter to be modified
- *
- * This function is called before setting mcbc filters
- * to modify filter value considering different offloads
- *
- * Return: None.
- */
-static void hdd_mcbc_filter_modification(hdd_context_t *pHddCtx,
- uint8_t *pMcBcFilter)
-{
- if (NULL == pHddCtx) {
- hdd_err("NULL HDD context passed");
- return;
- }
-
- *pMcBcFilter = pHddCtx->configuredMcastBcastFilter;
- if (pHddCtx->config->fhostArpOffload) {
- /* ARP offload is enabled, do not block bcast packets at RXP
- * Will be using Bitmasking to reset the filter. As we have
- * disable Broadcast filtering, Anding with the negation
- * of Broadcast BIT
- */
- *pMcBcFilter &= ~(HDD_MCASTBCASTFILTER_FILTER_ALL_BROADCAST);
- hdd_info("ARP offload is enabled");
- }
-#ifdef WLAN_NS_OFFLOAD
- if (pHddCtx->config->fhostNSOffload) {
- /* NS offload is enabled, do not block mcast packets at RXP
- * Will be using Bitmasking to reset the filter. As we have
- * disable Multicast filtering, Anding with the negation
- * of Multicast BIT
- */
- hdd_info("NS offload is enabled");
- *pMcBcFilter &= ~(HDD_MCASTBCASTFILTER_FILTER_ALL_MULTICAST);
- }
-#endif
-
- pHddCtx->configuredMcastBcastFilter = *pMcBcFilter;
-}
-
-/**
- * hdd_conf_mcastbcast_filter() - Configure multicast/broadcast filter
- * @pHddCtx: Global HDD context
- * @setfilter: true if filter is being set, false if filter is being cleared
- *
- * Return: None.
- */
-void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter)
-{
- QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
- tpSirWlanSetRxpFilters wlanRxpFilterParam =
- qdf_mem_malloc(sizeof(tSirWlanSetRxpFilters));
- if (NULL == wlanRxpFilterParam) {
- hdd_alert("qdf_mem_malloc failed ");
- return;
- }
- hdd_notice("Configuring Mcast/Bcast Filter Setting. setfilter %d", setfilter);
- if (true == setfilter) {
- hdd_mcbc_filter_modification(pHddCtx,
- &wlanRxpFilterParam->
- configuredMcstBcstFilterSetting);
- } else {
- /*Use the current configured value to clear */
- wlanRxpFilterParam->configuredMcstBcstFilterSetting =
- pHddCtx->configuredMcastBcastFilter;
- }
-
- wlanRxpFilterParam->setMcstBcstFilter = setfilter;
- qdf_ret_status =
- sme_configure_rxp_filter(pHddCtx->hHal, wlanRxpFilterParam);
-
- if (setfilter && (QDF_STATUS_SUCCESS == qdf_ret_status))
- pHddCtx->hdd_mcastbcast_filter_set = true;
-
- hdd_notice("%s to post set/reset filter to lower mac with status %d configuredMcstBcstFilterSetting = %d setMcstBcstFilter = %d",
- (QDF_STATUS_SUCCESS != qdf_ret_status) ? "Failed" : "Success",
- qdf_ret_status,
- wlanRxpFilterParam->configuredMcstBcstFilterSetting,
- wlanRxpFilterParam->setMcstBcstFilter);
-
- if (QDF_STATUS_SUCCESS != qdf_ret_status)
- qdf_mem_free(wlanRxpFilterParam);
-}
-
#ifdef WLAN_FEATURE_PACKET_FILTERING
/**
* wlan_hdd_set_mc_addr_list() - set MC address list in FW
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index 7f5ae167d166..92780a35f095 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -9592,47 +9592,23 @@ static inline int iw_clear_mc_filter_list(hdd_adapter_t *adapter)
static int iw_configure_mcbc_filter(hdd_adapter_t *adapter,
struct pkt_filter_mc_addr_list *req)
{
- int exit_code;
- QDF_STATUS status;
hdd_context_t *hdd_ctx;
- tSirWlanSetRxpFilters *req_params;
- tHalHandle hal;
ENTER();
hdd_info("Configuring mc/bc filter; setting:%u",
req->mcbc_filter_setting);
- req_params = qdf_mem_malloc(sizeof(*req_params));
- if (!req_params) {
- hdd_err("Out of memory");
- exit_code = -ENOMEM;
- goto exit_with_code;
- }
-
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
hdd_ctx->configuredMcastBcastFilter = req->mcbc_filter_setting;
- hdd_conf_hostoffload(adapter, true);
- req_params->configuredMcstBcstFilterSetting = req->mcbc_filter_setting;
- req_params->setMcstBcstFilter = true;
-
- hal = WLAN_HDD_GET_HAL_CTX(adapter);
- status = sme_configure_rxp_filter(hal, req_params);
- if (QDF_IS_STATUS_ERROR(status)) {
- hdd_err("Failed to configure HW MC/BC filter");
- qdf_mem_free(req_params);
- return -EINVAL;
- }
+ hdd_conf_hostoffload(adapter, true);
if (hdd_ctx->sus_res_mcastbcast_filter_valid)
hdd_ctx->sus_res_mcastbcast_filter = req->mcbc_filter_setting;
- exit_code = 0;
-
-exit_with_code:
EXIT();
- return exit_code;
+ return 0;
}
/**
@@ -9719,11 +9695,8 @@ static int __iw_clear_dynamic_mcbc_filter(struct net_device *dev,
char *extra)
{
int exit_code;
- QDF_STATUS status;
hdd_adapter_t *adapter;
hdd_context_t *hdd_ctx;
- tHalHandle hal;
- tSirWlanSetRxpFilters *set_params;
uint8_t ini_filter_setting;
ENTER();
@@ -9734,13 +9707,6 @@ static int __iw_clear_dynamic_mcbc_filter(struct net_device *dev,
goto exit_with_code;
}
- set_params = qdf_mem_malloc(sizeof(*set_params));
- if (!set_params) {
- hdd_err("Out of memory");
- exit_code = -ENOMEM;
- goto exit_with_code;
- }
-
/* clear basically means: reset to ini filter settings */
adapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@@ -9749,18 +9715,6 @@ static int __iw_clear_dynamic_mcbc_filter(struct net_device *dev,
hdd_ctx->configuredMcastBcastFilter = ini_filter_setting;
hdd_conf_hostoffload(adapter, true);
- set_params->configuredMcstBcstFilterSetting = ini_filter_setting;
- set_params->setMcstBcstFilter = true;
-
- hal = WLAN_HDD_GET_HAL_CTX(adapter);
- status = sme_configure_rxp_filter(hal, set_params);
- if (QDF_IS_STATUS_ERROR(status)) {
- hdd_err("Failed to clear HW mc/bc filter");
- qdf_mem_free(set_params);
- exit_code = -EINVAL;
- goto exit_with_code;
- }
-
if (hdd_ctx->sus_res_mcastbcast_filter_valid)
hdd_ctx->sus_res_mcastbcast_filter = ini_filter_setting;
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 9fce9fab620f..afc8f47bd210 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -2852,12 +2852,6 @@ typedef struct {
} tSirAppType2Params, *tpSirAppType2Params;
#endif
-typedef struct sSirWlanSetRxpFilters {
- uint8_t configuredMcstBcstFilterSetting;
- uint8_t setMcstBcstFilter;
-} tSirWlanSetRxpFilters, *tpSirWlanSetRxpFilters;
-
-
#define ANI_MAX_IBSS_ROUTE_TABLE_ENTRY 100
typedef struct sAniDestIpNextHopMacPair {
diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
index c6c531e3f618..8f4d75b0bc0e 100644
--- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
+++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
@@ -414,7 +414,6 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg)
CASE_RETURN_STRING(WMA_ENTER_PS_REQ);
CASE_RETURN_STRING(WMA_MISSED_BEACON_IND);
- CASE_RETURN_STRING(WMA_CFG_RXP_FILTER_REQ);
CASE_RETURN_STRING(WMA_SWITCH_CHANNEL_RSP);
CASE_RETURN_STRING(WMA_P2P_NOA_ATTR_IND);
CASE_RETURN_STRING(WMA_P2P_NOA_START_IND);
diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h
index 96414ad96e81..16d5f96a58f8 100644
--- a/core/sme/inc/sme_api.h
+++ b/core/sme/inc/sme_api.h
@@ -481,8 +481,6 @@ QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId,
QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId,
uint16_t frameType, uint8_t *matchData,
uint16_t matchLen);
-QDF_STATUS sme_configure_rxp_filter(tHalHandle hHal,
- tpSirWlanSetRxpFilters wlanRxpFilterParam);
QDF_STATUS sme_ConfigureAppsCpuWakeupState(tHalHandle hHal, bool isAppsAwake);
QDF_STATUS sme_configure_suspend_ind(tHalHandle hHal,
uint32_t conn_state_mask,
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 0b1022c5d71b..b952b858c8e1 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -7026,55 +7026,6 @@ QDF_STATUS sme_p2p_set_ps(tHalHandle hHal, tP2pPsConfig *data)
/* ---------------------------------------------------------------------------
- \fn sme_configure_rxp_filter
-
- \brief
- SME will pass this request to lower mac to set/reset the filter on RXP for
- multicast & broadcast traffic.
-
- \param
-
- hHal - The handle returned by mac_open.
-
- filterMask- Currently the API takes a 1 or 0 (set or reset) as filter.
- Basically to enable/disable the filter (to filter "all" mcbc traffic) based
- on this param. In future we can use this as a mask to set various types of
- filters as suggested below:
- FILTER_ALL_MULTICAST:
- FILTER_ALL_BROADCAST:
- FILTER_ALL_MULTICAST_BROADCAST:
-
- \return QDF_STATUS
-
- --------------------------------------------------------------------------- */
-QDF_STATUS sme_configure_rxp_filter(tHalHandle hHal,
- tpSirWlanSetRxpFilters wlanRxpFilterParam)
-{
- QDF_STATUS status = QDF_STATUS_SUCCESS;
- QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
- cds_msg_t cds_message;
-
- MTRACE(qdf_trace(QDF_MODULE_ID_SME,
- TRACE_CODE_SME_RX_HDD_CONFIG_RXPFIL, NO_SESSION, 0));
- status = sme_acquire_global_lock(&pMac->sme);
- if (QDF_IS_STATUS_SUCCESS(status)) {
- /* serialize the req through MC thread */
- cds_message.bodyptr = wlanRxpFilterParam;
- cds_message.type = WMA_CFG_RXP_FILTER_REQ;
- MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_TX_WMA_MSG,
- NO_SESSION, cds_message.type));
- qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
- if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- status = QDF_STATUS_E_FAILURE;
- }
- sme_release_global_lock(&pMac->sme);
- }
- return status;
-}
-
-/* ---------------------------------------------------------------------------
-
\fn sme_configure_suspend_ind
\brief
diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h
index a417e33b6f42..815234ffc4a7 100644
--- a/core/wma/inc/wma_types.h
+++ b/core/wma/inc/wma_types.h
@@ -175,8 +175,6 @@
#define WMA_ENTER_PS_REQ SIR_HAL_ENTER_PS_REQ
#define WMA_EXIT_PS_REQ SIR_HAL_EXIT_PS_REQ
-#define WMA_CFG_RXP_FILTER_REQ SIR_HAL_CFG_RXP_FILTER_REQ
-
#define WMA_SWITCH_CHANNEL_RSP SIR_HAL_SWITCH_CHANNEL_RSP
#define WMA_P2P_NOA_ATTR_IND SIR_HAL_P2P_NOA_ATTR_IND
#define WMA_P2P_NOA_START_IND SIR_HAL_P2P_NOA_START_IND
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-26 20:42:15 +0000