qcacld-3.0: Change country update retry logic

When setting the country code, host sets a flag to keep track if its
waiting for a response from firmware. During init cases, host receives
this event without it ever setting the flag. This could cause issues in
retry logic if multiple events come back to back. Set this flag when
starting modules to block other events from happening as the country
is being updated.

Change-Id: I5850568e9d5729b22346b8ec0a1f212a886c4c36
CRs-fixed: 3010090

core/hdd/src/wlan_hdd_main.c

@@ -4242,6 +4242,11 @@ int hdd_wlan_start_modules(struct hdd_context *hdd_ctx, bool reinit)
 
 	cds_set_driver_state_module_stop(false);
 
+	qdf_event_reset(&hdd_ctx->regulatory_update_event);
+	qdf_mutex_acquire(&hdd_ctx->regulatory_status_lock);
+	hdd_ctx->is_regulatory_update_in_progress = true;
+	qdf_mutex_release(&hdd_ctx->regulatory_status_lock);
+
 	switch (hdd_ctx->driver_status) {
 	case DRIVER_MODULES_UNINITIALIZED:
 		hdd_nofl_debug("Wlan transitioning (UNINITIALIZED -> CLOSED)");

core/hdd/src/wlan_hdd_regulatory.c

@@ -938,6 +938,8 @@ void hdd_reg_notifier(struct wiphy *wiphy,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
 	char country[REG_ALPHA2_LEN + 1] = {0};
+	bool update_already_in_progress =
+		hdd_ctx->is_regulatory_update_in_progress;
 
 	hdd_debug("country: %c%c, initiator %d, dfs_region: %d",
 		  request->alpha2[0],
@@ -968,7 +970,7 @@ void hdd_reg_notifier(struct wiphy *wiphy,
 		break;
 	}
 
-	if (QDF_IS_STATUS_ERROR(status)) {
+	if (QDF_IS_STATUS_ERROR(status) && !update_already_in_progress) {
 		hdd_err("Failed to set country");
 		qdf_mutex_acquire(&hdd_ctx->regulatory_status_lock);
 		hdd_ctx->is_regulatory_update_in_progress = false;