diff --git a/Makefile b/Makefile
index cf9f6077a..ea6328663 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ NAME = TOSSUG Baby Fish
 # Comments in this file are targeted only to the developer, do not
 # expect to learn how to build the kernel reading this file.
 
-SUBLEVEL = 104
+SUBLEVEL = 245
 
 # Do not:
 # o  use make's built-in rules and variables
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8821cu/include/drv_conf.h b/drivers/net/wireless/rockchip_wlan/rtl8821cu/include/drv_conf.h
index e14e7557d..3c35a27c7 100755
--- a/drivers/net/wireless/rockchip_wlan/rtl8821cu/include/drv_conf.h
+++ b/drivers/net/wireless/rockchip_wlan/rtl8821cu/include/drv_conf.h
@@ -434,7 +434,7 @@ defined(CONFIG_RTL8723B) || defined(CONFIG_RTL8703B) || defined(CONFIG_RTL8723D)
 	#endif/*CONFIG_HWMPCAP_GEN2*/
 #endif/*(CONFIG_IFACE_NUMBER > 2)*/
 
-#define MACID_NUM_SW_LIMIT 32
+#define MACID_NUM_SW_LIMIT 190
 #define SEC_CAM_ENT_NUM_SW_LIMIT 32
 
 #if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A) || defined(CONFIG_RTL8814A)
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index ace1a087f..4fb40cfdc 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -698,6 +698,8 @@ static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data,
 				return;
 			} else {
 				noa_num = (noa_len - 2) / 13;
+				if (noa_num > P2P_MAX_NOA_NUM)
+                    			noa_num = P2P_MAX_NOA_NUM;
 			}
 			noa_index = ie[3];
 			if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode ==
@@ -792,6 +794,8 @@ static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data,
 				return;
 			} else {
 				noa_num = (noa_len - 2) / 13;
+				if (noa_num > P2P_MAX_NOA_NUM)
+                    			noa_num = P2P_MAX_NOA_NUM;
 			}
 			noa_index = ie[3];
 			if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode ==