diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c
index 1d061b3..cfa8184 100644
--- a/core/rtw_ioctl_set.c
+++ b/core/rtw_ioctl_set.c
@@ -378,13 +378,6 @@ handle_tkip_countermeasure:
 		}
 	}
 
-	#ifdef CONFIG_VALIDATE_SSID
-	if (rtw_validate_ssid(ssid) == false) {
-		status = _FAIL;
-		goto release_mlme_lock;
-	}
-	#endif
-
 	_rtw_memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID));
 	pmlmepriv->assoc_by_bssid=false;
 
diff --git a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c
index 36170c3..8fb2452 100644
--- a/os_dep/ioctl_cfg80211.c
+++ b/os_dep/ioctl_cfg80211.c
@@ -1583,26 +1583,17 @@ void rtw_cfg80211_surveydone_event_callback(_adapter *padapter)
 	phead = get_list_head(queue);
 	plist = get_next(phead);
 
-	while (1)
-	{
+	while (1) {
 		if (rtw_end_of_queue_search(phead,plist)== true)
 			break;
 
 		pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list);
 
 		//report network only if the current channel set contains the channel to which this network belongs
-		if (rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0
-			#ifdef CONFIG_VALIDATE_SSID
-			&& true == rtw_validate_ssid(&(pnetwork->network.Ssid))
-			#endif
-		)
-		{
-			//ev=translate_scan(padapter, a, pnetwork, ev, stop);
+		if (rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0)
 			rtw_cfg80211_inform_bss(padapter, pnetwork);
-		}
 
 		plist = get_next(plist);
-
 	}
 
 	_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c
index 705f53f..289bd4c 100644
--- a/os_dep/ioctl_linux.c
+++ b/os_dep/ioctl_linux.c
@@ -1940,26 +1940,18 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
 		pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list);
 
 		//report network only if the current channel set contains the channel to which this network belongs
-		if (rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0
-			#ifdef CONFIG_VALIDATE_SSID
-			&& true == rtw_validate_ssid(&(pnetwork->network.Ssid))
-			#endif
-		)
-		{
+		if (rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0)
 			ev=translate_scan(padapter, a, pnetwork, ev, stop);
-		}
 
 		plist = get_next(plist);
-
 	}
 
 	_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
 
-       wrqu->data.length = ev-extra;
+	wrqu->data.length = ev-extra;
 	wrqu->data.flags = 0;
 
 exit:
-
 	_func_exit_;
 
 	#ifdef DBG_IOCTL
@@ -1967,7 +1959,6 @@ exit:
 	#endif
 
 	return ret ;
-
 }
 
 //set ssid flow