File wifi-sle-micro6.patch of Package nvidia-jetson-36-jp7

diff --git a/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/ioctl_cfg80211.c
index 4c470ac3..771fbfc8 100644
--- a/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/ioctl_cfg80211.c
+++ b/drivers/net/wireless/realtek/rtl8822ce/os_dep/linux/ioctl_cfg80211.c
@@ -5618,10 +5618,11 @@ exit:
 }
 
 static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
-		struct cfg80211_beacon_data *info)
+		struct cfg80211_beacon_update *param)
 {
 	int ret = 0;
 	_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
+	struct cfg80211_beacon_data *info = &param->beacon;
 
 	RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
 
diff --git a/drivers/net/wireless/realtek/rtl8852ce/Makefile b/drivers/net/wireless/realtek/rtl8852ce/Makefile
index 42c00833..5b723e94 100644
--- a/drivers/net/wireless/realtek/rtl8852ce/Makefile
+++ b/drivers/net/wireless/realtek/rtl8852ce/Makefile
@@ -16,13 +16,13 @@ EXTRA_CFLAGS += -Wno-unused
 #EXTRA_CFLAGS += -Wno-uninitialized
 EXTRA_CFLAGS += -Wno-missing-prototypes
 EXTRA_CFLAGS += -Wno-missing-declarations
-EXTRA_CFLAGS += -Wno-enum-conversion
+#EXTRA_CFLAGS += -Wno-enum-conversion
 
 ############ ANDROID COMMON KERNEL ############
 # clang
 ifeq ($(CC), clang)
 EXTRA_CFLAGS += -Wno-uninitialized
-EXTRA_CFLAGS += -Wno-enum-conversion
+#EXTRA_CFLAGS += -Wno-enum-conversion
 EXTRA_CFLAGS += -Wno-fortify-source
 EXTRA_CFLAGS += -Wno-invalid-source-encoding
 EXTRA_CFLAGS += -Wno-tautological-pointer-compare
diff --git a/drivers/net/wireless/realtek/rtl8852ce/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/realtek/rtl8852ce/os_dep/linux/ioctl_cfg80211.c
index dd03b12d..9679a7d3 100644
--- a/drivers/net/wireless/realtek/rtl8852ce/os_dep/linux/ioctl_cfg80211.c
+++ b/drivers/net/wireless/realtek/rtl8852ce/os_dep/linux/ioctl_cfg80211.c
@@ -5714,22 +5714,14 @@ static int rtw_cfg80211_set_beacon_ies(struct net_device *net, const u8 *head,
 	return ret;
 }
 
-static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0))
+int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
 				      struct cfg80211_ap_update *param
-#else
-				      struct cfg80211_beacon_data *param
-#endif
 )
 
 {
 	int ret = 0;
 	_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0))
 	struct cfg80211_beacon_data *info = &param->beacon;
-#else
-	struct cfg80211_beacon_data *info = param;
-#endif
 
 	RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
 
diff --git a/drivers/net/wireless/realtek/rtl8852ce/phl/hal_g6/phy/bb/halbb_physts.h b/drivers/net/wireless/realtek/rtl8852ce/phl/hal_g6/phy/bb/halbb_physts.h
index dab93dbb..80367e33 100644
--- a/drivers/net/wireless/realtek/rtl8852ce/phl/hal_g6/phy/bb/halbb_physts.h
+++ b/drivers/net/wireless/realtek/rtl8852ce/phl/hal_g6/phy/bb/halbb_physts.h
@@ -772,8 +772,8 @@ void halbb_physts_rpt_gen(struct bb_info *bb, u32 physts_bitmap,
 			  struct physts_result *rpt,
 			  bool physts_rpt_valid, struct physts_rxd *desc,
 			  bool is_cck_rate, bool is_ie8_valid);
-void halbb_physts_ie_bitmap_set(struct bb_info *bb, u32 ie_page, u32 bitmap);
-u32 halbb_physts_ie_bitmap_get(struct bb_info *bb, u32 ie_page);
+void halbb_physts_ie_bitmap_set(struct bb_info *bb, enum bb_physts_bitmap_t ie_page, u32 bitmap);
+u32 halbb_physts_ie_bitmap_get(struct bb_info *bb, enum bb_physts_bitmap_t ie_page);
 void halbb_physts_ie_bitmap_en(struct bb_info *bb, enum bb_physts_bitmap_t type,
 			       enum bb_physts_ie_t ie, bool en);
 void halbb_phy_sts_manual_trig(struct bb_info *bb, enum bb_mode_type mode, u8 ss);