Quellcode durchsuchen

qcacld-3.0: Fill regulatory info before wiphy init

Currently, some regulatory information is being populated after it may
be needed by wiphy for initialization. Reorder the order of execution to
populate this data before it is needed by wiphy.

Change-Id: I218c19c84b6c7f0f62a94b211201281939838438
CRs-Fixed: 1074146
Dustin Brown vor 8 Jahren
Ursprung
Commit
38f2b5584c
1 geänderte Dateien mit 6 neuen und 6 gelöschten Zeilen
  1. 6 6
      core/hdd/src/wlan_hdd_regulatory.c

+ 6 - 6
core/hdd/src/wlan_hdd_regulatory.c

@@ -488,18 +488,18 @@ int hdd_regulatory_init(hdd_context_t *hdd_ctx, struct wiphy *wiphy)
 
 	reg_info = &hdd_ctx->reg;
 
-	hdd_regulatory_wiphy_init(hdd_ctx, reg_info, wiphy);
-
-	hdd_process_regulatory_data(hdd_ctx, wiphy, true);
-
-	reg_info->cc_src = SOURCE_DRIVER;
-
 	ret_val = cds_fill_some_regulatory_info(reg_info);
 	if (ret_val) {
 		hdd_err("incorrect BDF regulatory data");
 		return ret_val;
 	}
 
+	hdd_regulatory_wiphy_init(hdd_ctx, reg_info, wiphy);
+
+	hdd_process_regulatory_data(hdd_ctx, wiphy, true);
+
+	reg_info->cc_src = SOURCE_DRIVER;
+
 	cds_put_default_country(reg_info->alpha2);
 
 	init_completion(&hdd_ctx->reg_init);