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
diff --git a/Kbuild b/Kbuild
index 0183dba..9b2a8bc 100644
--- a/Kbuild
+++ b/Kbuild
@@ -417,7 +417,9 @@
$(HDD_SRC_DIR)/wlan_hdd_hostapd.o \
$(HDD_SRC_DIR)/wlan_hdd_ioctl.o \
$(HDD_SRC_DIR)/wlan_hdd_main.o \
+ $(HDD_SRC_DIR)/wlan_hdd_object_manager.o \
$(HDD_SRC_DIR)/wlan_hdd_oemdata.o \
+ $(HDD_SRC_DIR)/wlan_hdd_packet_filter.o \
$(HDD_SRC_DIR)/wlan_hdd_power.o \
$(HDD_SRC_DIR)/wlan_hdd_regulatory.o \
$(HDD_SRC_DIR)/wlan_hdd_request_manager.o \
@@ -427,8 +429,7 @@
$(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_object_manager.o
+ $(HDD_SRC_DIR)/wlan_hdd_wowl.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 67c2c8f..af0f102 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 64739ae..8d2bbfc 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 525a455..8e5ec8b 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(struct hdd_adapter *adapter)
{
@@ -36,7 +37,7 @@
hdd_err("HDD context is Null!!!");
return -EINVAL;
}
- if (!hdd_ctx->user_configured_pkt_filter_rules) {
+ if (hdd_ctx->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 @@
return -EINVAL;
}
- if (!hdd_ctx->user_configured_pkt_filter_rules) {
+ if (hdd_ctx->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 @@
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(hdd_ctx,
&packet_filter_default_rules,
adapter->sessionId);