diff --git a/core/mesh/rtw_mesh.c b/core/mesh/rtw_mesh.c
index e4d5ed3..b7338c7 100644
--- a/core/mesh/rtw_mesh.c
+++ b/core/mesh/rtw_mesh.c
@@ -438,6 +438,9 @@ void rtw_chk_candidate_peer_notify(_adapter *adapter, struct wlan_network *scann
 		, scanned->network.MacAddress
 		, BSS_EX_TLV_IES(&scanned->network)
 		, BSS_EX_TLV_IES_LEN(&scanned->network)
+		#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0))
+		, scanned->network.Rssi
+		#endif
 		, GFP_ATOMIC
 	);
 #endif
diff --git a/os_dep/linux/ioctl_cfg80211.h b/os_dep/linux/ioctl_cfg80211.h
index f57586d..e789efa 100644
--- a/os_dep/linux/ioctl_cfg80211.h
+++ b/os_dep/linux/ioctl_cfg80211.h
@@ -364,8 +364,10 @@ void rtw_cfg80211_deinit_rfkill(struct wiphy *wiphy);
 #endif
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0))
 #define rtw_cfg80211_notify_new_peer_candidate(wdev, addr, ie, ie_len, gfp) cfg80211_notify_new_peer_candidate(wdev_to_ndev(wdev), addr, ie, ie_len, gfp)
+#else
+#define rtw_cfg80211_notify_new_peer_candidate(wdev, addr, ie, ie_len, sig_dbm, gfp) cfg80211_notify_new_peer_candidate(wdev_to_ndev(wdev), addr, ie, ie_len, sig_dbm, gfp)
 #endif
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
diff --git a/os_dep/linux/rtw_rhashtable.h b/os_dep/linux/rtw_rhashtable.h
index 567ab39..803d1b4 100644
--- a/os_dep/linux/rtw_rhashtable.h
+++ b/os_dep/linux/rtw_rhashtable.h
@@ -40,7 +40,11 @@ typedef struct rhashtable_iter rtw_rhashtable_iter;
 
 int rtw_rhashtable_walk_enter(rtw_rhashtable *ht, rtw_rhashtable_iter *iter);
 #define rtw_rhashtable_walk_exit(iter) rhashtable_walk_exit(iter)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0))
 #define rtw_rhashtable_walk_start(iter) rhashtable_walk_start(iter)
+#else
+#define rtw_rhashtable_walk_start(iter) rhashtable_walk_start_check(iter)
+#endif
 #define rtw_rhashtable_walk_next(iter) rhashtable_walk_next(iter)
 #define rtw_rhashtable_walk_stop(iter) rhashtable_walk_stop(iter)