Parcourir la source

qcacld-3.0: MCL change after serialization enhancement

1. Set all MCL cmds as blocking cmds.
2. Rename WLAN_SER_CMD_STOP_BSS to WLAN_SER_CMD_VDEV_STOP_BSS.
3. Add new binary files and remove old binary files in Kbuild.
4. Disable CONFIG_SERIALIZATION_V1 in Kbuild, switch to new
   serialization code.

Change-Id: I46f876e4cbc31881ca0559e4705cddf4a26a46c1
CRs-Fixed: 2315411
Jianmin Zhu il y a 6 ans
Parent
commit
c2eae9c566
2 fichiers modifiés avec 9 ajouts et 6 suppressions
  1. 6 5
      Kbuild
  2. 3 1
      core/sme/src/csr/csr_api_roam.c

+ 6 - 5
Kbuild

@@ -1275,13 +1275,15 @@ UMAC_SER_SRC_DIR := $(UMAC_SER_DIR)/src
 UMAC_SER_OBJ_DIR := $(WLAN_COMMON_ROOT)/$(UMAC_SER_SRC_DIR)
 
 UMAC_SER_INC := -I$(WLAN_COMMON_INC)/$(UMAC_SER_INC_DIR)
-UMAC_SER_OBJS := $(UMAC_SER_OBJ_DIR)/wlan_serialization_dequeue.o \
-		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_enqueue.o \
-		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_main.o \
+UMAC_SER_OBJS := $(UMAC_SER_OBJ_DIR)/wlan_serialization_main.o \
 		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_api.o \
 		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_utils.o \
 		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_legacy_api.o \
-		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_rules.o
+		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_rules.o \
+		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_internal.o \
+		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_non_scan.o \
+		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_queue.o \
+		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_scan.o
 
 ###### WIFI POS ########
 WIFI_POS_OS_IF_DIR := $(WLAN_COMMON_ROOT)/os_if/linux/wifi_pos/src
@@ -2314,7 +2316,6 @@ cppflags-y += -DWLAN_CMD_SERIALIZATION_LOCKING
 
 #CONFIG_SERIALIZATION_V1: Don't use enhancements to serialization component
 #No CONFIG_SERIALIZATION_V1: Use enhancements to serialization component
-cppflags-y += -DCONFIG_SERIALIZATION_V1
 
 ccflags-$(CONFIG_ENABLE_SIZE_OPTIMIZE) += -Os
 

+ 3 - 1
core/sme/src/csr/csr_api_roam.c

@@ -20347,7 +20347,7 @@ static enum wlan_serialization_cmd_type csr_get_roam_cmd_type(
 		cmd_type = WLAN_SER_CMD_FORCE_IBSS_LEAVE;
 		break;
 	case eCsrStopBss:
-		cmd_type = WLAN_SER_CMD_STOP_BSS;
+		cmd_type = WLAN_SER_CMD_VDEV_STOP_BSS;
 		break;
 	case eCsrSmeIssuedFTReassoc:
 		cmd_type = WLAN_SER_CMD_SME_ISSUE_FT_REASSOC;
@@ -20486,6 +20486,8 @@ QDF_STATUS csr_set_serialization_params_to_cmd(tpAniSirGlobal mac_ctx,
 	cmd->cmd_timeout_duration = SME_DEFAULT_CMD_TIMEOUT;
 	cmd->cmd_cb = sme_ser_cmd_callback;
 	cmd->is_high_priority = high_priority;
+	cmd->is_blocking = true;
+
 	return QDF_STATUS_SUCCESS;
 }