A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 06:03:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacld-3.0: Fix wlan module loading issue" into wlan-cld3.driver.lnx.2.0-dev

Browse source
This commit is contained in:
CNSS_WLAN Service 2017-10-17 12:54:16 -07:00 • committed by Gerrit - the friendly Code Review server
commit b94cead491
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Kbuild
View file

@ -417,7 +417,9 @@ HDD_OBJS := $(HDD_SRC_DIR)/wlan_hdd_assoc.o \
$(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_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_object_manager.o
$(HDD_SRC_DIR)/wlan_hdd_wowl.o
ifeq ($(CONFIG_WLAN_DEBUGFS), y)
HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_debugfs.o

3
core/hdd/inc/wlan_hdd_packet_filter_api.h
View file

@ -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

2
core/hdd/inc/wlan_hdd_packet_filter_rules.h
View file

@ -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,

7
core/hdd/src/wlan_hdd_packet_filter.c
View file

@ -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 @@ int hdd_enable_default_pkt_filters(struct hdd_adapter *adapter)
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 @@ int hdd_disable_default_pkt_filters(struct hdd_adapter *adapter)
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 @@ int hdd_disable_default_pkt_filters(struct hdd_adapter *adapter)
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);