Эх сурвалжийг харах

Merge "qcacmn: Use the correct datatype for wireless modes"

Linux Build Service Account 3 жил өмнө
parent
commit
76bd5c85c9

+ 1 - 1
umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h

@@ -1492,7 +1492,7 @@ struct wlan_lmac_if_reg_rx_ops {
 						 wlan_objmgr_pdev *pdev);
 	QDF_STATUS
 	(*reg_update_pdev_wireless_modes)(struct wlan_objmgr_pdev *pdev,
-					  uint32_t wireless_modes);
+					  uint64_t wireless_modes);
 	bool
 	(*reg_is_range_only6g)(qdf_freq_t low_freq, qdf_freq_t high_freq);
 	bool

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

@@ -2818,7 +2818,7 @@ QDF_STATUS reg_modify_pdev_chan_range(struct wlan_objmgr_pdev *pdev)
 }
 
 QDF_STATUS reg_update_pdev_wireless_modes(struct wlan_objmgr_pdev *pdev,
-					  uint32_t wireless_modes)
+					  uint64_t wireless_modes)
 {
 	struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj;
 

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

@@ -786,7 +786,7 @@ QDF_STATUS reg_modify_pdev_chan_range(struct wlan_objmgr_pdev *pdev);
  * Return : QDF_STATUS
  */
 QDF_STATUS reg_update_pdev_wireless_modes(struct wlan_objmgr_pdev *pdev,
-					  uint32_t wireless_modes);
+					  uint64_t wireless_modes);
 
 /**
  * reg_get_phybitmap() - Get phybitmap from regulatory pdev_priv_obj

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

@@ -1164,7 +1164,7 @@ QDF_STATUS wlan_reg_get_phybitmap(struct wlan_objmgr_pdev *pdev,
  * Return : QDF_STATUS
  */
 QDF_STATUS wlan_reg_update_pdev_wireless_modes(struct wlan_objmgr_pdev *pdev,
-					       uint32_t wireless_modes);
+					       uint64_t wireless_modes);
 /**
  * wlan_reg_disable_chan_coex() - Disable Coexisting channels based on the input
  * bitmask

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

@@ -973,7 +973,7 @@ QDF_STATUS wlan_reg_modify_pdev_chan_range(struct wlan_objmgr_pdev *pdev)
 }
 
 QDF_STATUS wlan_reg_update_pdev_wireless_modes(struct wlan_objmgr_pdev *pdev,
-					       uint32_t wireless_modes)
+					       uint64_t wireless_modes)
 {
 	return reg_update_pdev_wireless_modes(pdev, wireless_modes);
 }