diff options
| author | SaidiReddy Yenuga <saidir@codeaurora.org> | 2017-03-09 17:31:25 +0530 |
|---|---|---|
| committer | Prakash Dhavali <pdhavali@codeaurora.org> | 2017-03-09 21:08:47 -0800 |
| commit | dd83f7e7183145784726ddbae4c6042343d8a1ad (patch) | |
| tree | 79bc54a32b9187f100ebce5d701e68632162dbcc | |
| parent | 267376012157bf9c55622909a04ff6bd58bc41ee (diff) | |
qcacld-3.0: Fix wlan module loading issue
As part of configure default filters over suspend code
changes wlan module loading broken.
Fix the loading issue by adding the newly added files
to Kbuild.
CRs-Fixed: 2017259
Change-Id: Ib33efa8f7f5e2ca8d9734181df94f70557e9f9cd
| -rw-r--r-- | Kbuild | 3 | ||||
| -rw-r--r-- | core/hdd/inc/wlan_hdd_packet_filter_api.h | 3 | ||||
| -rw-r--r-- | core/hdd/inc/wlan_hdd_packet_filter_rules.h | 2 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_packet_filter.c | 7 |
4 files changed, 9 insertions, 6 deletions
@@ -405,7 +405,8 @@ HDD_OBJS := $(HDD_SRC_DIR)/wlan_hdd_assoc.o \ $(HDD_SRC_DIR)/wlan_hdd_trace.o \ $(HDD_SRC_DIR)/wlan_hdd_wext.o \ $(HDD_SRC_DIR)/wlan_hdd_wmm.o \ - $(HDD_SRC_DIR)/wlan_hdd_wowl.o + $(HDD_SRC_DIR)/wlan_hdd_wowl.o \ + $(HDD_SRC_DIR)/wlan_hdd_packet_filter.o ifeq ($(CONFIG_WLAN_DEBUGFS), y) HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_debugfs.o diff --git a/core/hdd/inc/wlan_hdd_packet_filter_api.h b/core/hdd/inc/wlan_hdd_packet_filter_api.h index 9ae980a5bead..dc262f597096 100644 --- a/core/hdd/inc/wlan_hdd_packet_filter_api.h +++ b/core/hdd/inc/wlan_hdd_packet_filter_api.h @@ -25,7 +25,8 @@ */ /* Include files */ - +#include "wlan_hdd_assoc.h" +#include "wlan_hdd_power.h" /** * hdd_enable_default_pkt_filters() - Enable default packet filters based * on, filters bit map provided in INI, when target goes to suspend mode diff --git a/core/hdd/inc/wlan_hdd_packet_filter_rules.h b/core/hdd/inc/wlan_hdd_packet_filter_rules.h index 64739aeeeef5..8d2bbfc92ebb 100644 --- a/core/hdd/inc/wlan_hdd_packet_filter_rules.h +++ b/core/hdd/inc/wlan_hdd_packet_filter_rules.h @@ -60,7 +60,7 @@ * @compare_data: Array of 8 bytes * @data_mask: Mask to be applied on the received packet data (Array of 8 bytes) */ -static const struct pkt_filter_cfg +static struct pkt_filter_cfg packet_filter_default_rules[MAX_NUM_PACKET_FILTERS] = { { .filter_action = 1, .filter_id = 0, diff --git a/core/hdd/src/wlan_hdd_packet_filter.c b/core/hdd/src/wlan_hdd_packet_filter.c index 39cbe3a7f820..1b0c3cfa3a86 100644 --- a/core/hdd/src/wlan_hdd_packet_filter.c +++ b/core/hdd/src/wlan_hdd_packet_filter.c @@ -25,6 +25,7 @@ /* Include Files */ #include "wlan_hdd_packet_filter_api.h" +#include "wlan_hdd_packet_filter_rules.h" int hdd_enable_default_pkt_filters(hdd_adapter_t *pAdapter) { @@ -36,7 +37,7 @@ int hdd_enable_default_pkt_filters(hdd_adapter_t *pAdapter) hdd_err("HDD context is Null!!!"); return -EINVAL; } - if (!pHddCtx->user_configured_pkt_filter_rules) { + if (pHddCtx->user_configured_pkt_filter_rules) { hdd_info("user has defined pkt filter run hence skipping default packet filter rule"); return 0; } @@ -73,7 +74,7 @@ int hdd_disable_default_pkt_filters(hdd_adapter_t *pAdapter) return -EINVAL; } - if (!pHddCtx->user_configured_pkt_filter_rules) { + if (pHddCtx->user_configured_pkt_filter_rules) { hdd_info("user has defined pkt filter run hence skipping default packet filter rule"); return 0; } @@ -86,7 +87,7 @@ int hdd_disable_default_pkt_filters(hdd_adapter_t *pAdapter) i+1, filter_id); packet_filter_default_rules.filter_action = HDD_RCV_FILTER_CLEAR; - packet_filter_default_rules.filter_id = i; + packet_filter_default_rules.filter_id = filter_id; wlan_hdd_set_filter(pHddCtx, &packet_filter_default_rules, pAdapter->sessionId); |