浏览代码

qcacmn: Use psoc for 6ghz level support

Whether the firmware supports 6ghz channels, needs to be known
before pdev is created. Therefore move the check for 6ghz wmi
service support to psoc..

Change-Id: Iad7717225c49f6c95988f5ac81c7ee405b7c2c9e
CRs-Fixed: 2658111
Amar Singhal 5 年之前
父节点
当前提交
c6d99aa14b

+ 1 - 8
umac/regulatory/core/src/reg_services_common.c

@@ -3611,16 +3611,9 @@ bool reg_is_6ghz_op_class(struct wlan_objmgr_pdev *pdev, uint8_t op_class)
 		(op_class <= MAX_6GHZ_OPER_CLASS));
 		(op_class <= MAX_6GHZ_OPER_CLASS));
 }
 }
 
 
-bool reg_is_6ghz_supported(struct wlan_objmgr_pdev *pdev)
+bool reg_is_6ghz_supported(struct wlan_objmgr_psoc *psoc)
 {
 {
 	struct wlan_regulatory_psoc_priv_obj *psoc_priv_obj;
 	struct wlan_regulatory_psoc_priv_obj *psoc_priv_obj;
-	struct wlan_objmgr_psoc *psoc;
-
-	psoc = wlan_pdev_get_psoc(pdev);
-	if (!psoc) {
-		reg_err_rl("psoc is NULL");
-		return false;
-	}
 
 
 	psoc_priv_obj = reg_get_psoc_obj(psoc);
 	psoc_priv_obj = reg_get_psoc_obj(psoc);
 
 

+ 2 - 2
umac/regulatory/core/src/reg_services_common.h

@@ -999,9 +999,9 @@ bool reg_is_6ghz_op_class(struct wlan_objmgr_pdev *pdev,
 /**
 /**
  * reg_is_6ghz_supported() - Whether 6ghz is supported
  * reg_is_6ghz_supported() - Whether 6ghz is supported
  *
  *
- * @pdev: pointer to pdev
+ * @psoc: pointer to psoc
  */
  */
-bool reg_is_6ghz_supported(struct wlan_objmgr_pdev *pdev);
+bool reg_is_6ghz_supported(struct wlan_objmgr_psoc *psoc);
 
 
 /**
 /**
  * reg_get_unii_5g_bitmap() - get unii_5g_bitmap value
  * reg_get_unii_5g_bitmap() - get unii_5g_bitmap value

+ 2 - 2
umac/regulatory/dispatcher/inc/wlan_reg_services_api.h

@@ -1278,11 +1278,11 @@ bool wlan_reg_is_6ghz_op_class(struct wlan_objmgr_pdev *pdev,
 
 
 /**
 /**
  * wlan_reg_is_6ghz_supported() - Whether 6ghz is supported
  * wlan_reg_is_6ghz_supported() - Whether 6ghz is supported
- * @pdev: pdev ptr
+ * @psoc: psoc ptr
  *
  *
  * Return: bool
  * Return: bool
  */
  */
-bool wlan_reg_is_6ghz_supported(struct wlan_objmgr_pdev *pdev);
+bool wlan_reg_is_6ghz_supported(struct wlan_objmgr_psoc *psoc);
 
 
 #ifdef HOST_OPCLASS_EXT
 #ifdef HOST_OPCLASS_EXT
 /**
 /**

+ 2 - 2
umac/regulatory/dispatcher/src/wlan_reg_services_api.c

@@ -1082,9 +1082,9 @@ bool wlan_reg_is_6ghz_op_class(struct wlan_objmgr_pdev *pdev,
 	return reg_is_6ghz_op_class(pdev, op_class);
 	return reg_is_6ghz_op_class(pdev, op_class);
 }
 }
 
 
-bool wlan_reg_is_6ghz_supported(struct wlan_objmgr_pdev *pdev)
+bool wlan_reg_is_6ghz_supported(struct wlan_objmgr_psoc *psoc)
 {
 {
-	return reg_is_6ghz_supported(pdev);
+	return reg_is_6ghz_supported(psoc);
 }
 }
 
 
 #ifdef HOST_OPCLASS_EXT
 #ifdef HOST_OPCLASS_EXT