wlan: get rid of Meizu's CONFIG_NL80211_FASTSCAN

7 files changed, 0 insertions, 104 deletions

diff --git a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/common/wlan_lib.c b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/common/wlan_lib.c
index 1340d31fa..46f87fbe1 100644
--- a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/common/wlan_lib.c
+++ b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/common/wlan_lib.c
@@ -2035,18 +2035,6 @@ wlanIST (
 	/* CONNSYS can decide to sleep */
     RECLAIM_POWER_CONTROL_TO_PM(prAdapter, FALSE);
 
-#ifdef CONFIG_NL80211_FASTSCAN
-	if(meizu_target_ssid(prAdapter)){
-		struct cfg80211_scan_request *request ;
-		if(!prAdapter->prGlueInfo->prScanRequest)
-		     return ;
-		request = prAdapter->prGlueInfo->prScanRequest;
-		prAdapter->prGlueInfo->prScanRequest = NULL ;
-		cfg80211_scan_done(request,0);
-		printk("%s:report scan result\n",__func__);
-	}
-#endif //end #ifdef CONFIG_NL80211_FASTSCAN
-
     return;
 }
 
diff --git a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/include/mgmt/scan.h b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/include/mgmt/scan.h
index 8b8f0d5ff..f013f7c68 100644
--- a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/include/mgmt/scan.h
+++ b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/include/mgmt/scan.h
@@ -935,10 +935,6 @@ scanRemoveBssDescByBandAndNetwork (
     IN ENUM_NETWORK_TYPE_INDEX_T eNetTypeIndex
     );
 
-#ifdef CONFIG_NL80211_FASTSCAN
-int meizu_target_ssid(P_ADAPTER_T prAdapter);
-#endif
-
 /* BSS-DESC State Change */
 VOID
 scanRemoveConnFlagOfBssDescByBssid (
diff --git a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/mgmt/scan.c b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/mgmt/scan.c
index e83a43f04..b0977b3ab 100644
--- a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/mgmt/scan.c
+++ b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/mgmt/scan.c
@@ -712,10 +712,6 @@ scnInit (
     prScanInfo = &(prAdapter->rWifiVar.rScanInfo);
     pucBSSBuff = &prScanInfo->aucScanBuffer[0];
 
-#ifdef CONFIG_NL80211_FASTSCAN
-    prAdapter->prGlueInfo->first_time_scan = 0 ;
-#endif
-
     DBGLOG(SCN, INFO, ("->scnInit()\n"));
 
     //4 <1> Reset STATE and Message List
@@ -782,10 +778,6 @@ scnUninit (
 
     prScanInfo->rLastScanCompletedTime = (OS_SYSTIME)0;
 
-#ifdef CONFIG_NL80211_FASTSCAN
-    prAdapter->prGlueInfo->first_time_scan = 0;
-#endif
-
     /* NOTE(Kevin): Check rPendingMsgList ? */
 
     //4 <2> Reset link list of BSS_DESC_T
@@ -2177,34 +2169,6 @@ scanAddToBssDesc (
     return prBssDesc;
 }
 
-#ifdef CONFIG_NL80211_FASTSCAN
-static int is_target(P_GLUE_INFO_T prGlueInfo,const char * ssid)
-{
-	int i = 0 ;
-
-	for(i=0;i<10;i++){
-		if((prGlueInfo->prio_ssid[i][0])&& \
-			(!strncmp(&prGlueInfo->prio_ssid[i][0],ssid,32))){
-			printk("%s:target ssid[%s]\n",__func__,&prGlueInfo->prio_ssid[i][0]);
-			return 1 ;
-		}
-	}
-
-	return 0;
-}
-
-int meizu_target_ssid(P_ADAPTER_T prAdapter)
-{
-	int ret = 0 ;
-
-	//printk("%s_%d[%d]\n",__func__,__LINE__,scan_target);
-	ret = (prAdapter->prGlueInfo->first_time_scan==1);
-	if(1==ret)
-		prAdapter->prGlueInfo->first_time_scan++;
-	return ret;
-}
-#endif //end #ifdef CONFIG_NL80211_FASTSCAN
-
 /*----------------------------------------------------------------------------*/
 /*!
 * @brief Convert the Beacon or ProbeResp Frame in SW_RFB_T to scan result for query
@@ -2304,13 +2268,6 @@ scanAddScanResult (
 				prBssDesc->ucRCPI, RCPI_TO_dBm(prBssDesc->ucRCPI)));
 	#endif
 
-#ifdef CONFIG_NL80211_FASTSCAN
-	if((!prAdapter->prGlueInfo->first_time_scan)&&is_target(prAdapter->prGlueInfo,prBssDesc->aucSSID)){
-		prAdapter->prGlueInfo->first_time_scan ++ ;
-		printk("%s_%d,set scan_ssid\n",__func__,__LINE__);
-	}
-#endif //end #ifdef CONFIG_NL80211_FASTSCAN
-
 #if (CFG_SUPPORT_TDLS == 1)
 {
 	/* TDLS test purpose */
diff --git a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_cfg80211.c b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_cfg80211.c
index 210779850..4b1b3f92a 100644
--- a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_cfg80211.c
+++ b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_cfg80211.c
@@ -739,36 +739,6 @@ mtk_cfg80211_change_station (
 	return 0;
 }
 
-#ifdef CONFIG_NL80211_FASTSCAN
-struct prio_ssid {
-char ssid[32];
-};
-
-int meizu_cfg80211_fastscan_cmd(struct wiphy *wiphy,void * data,int len)
-{
-	P_GLUE_INFO_T prGlueInfo = NULL;
-	UINT_32 i;
-	struct prio_ssid * pssid = (struct prio_ssid *)data;
-	int num_ssid ;
-
-	prGlueInfo = (P_GLUE_INFO_T) wiphy_priv(wiphy);
-	ASSERT(prGlueInfo);
-
-	num_ssid = len/sizeof(*pssid);
-	printk("%s :prio_ssid num[%d]\n",__func__,num_ssid);
-
-	if(num_ssid<=0 || num_ssid>10)
-		return -1 ;
-
-	for(i=0;num_ssid;num_ssid--,i++){
-		printk("%s: prio_ssid[%s]\n",__func__,pssid[num_ssid-1].ssid);
-		strncpy(&prGlueInfo->prio_ssid[i][0],pssid[num_ssid-1].ssid,32);
-	}
-
-	return 0;
-}
-#endif //end #ifdef CONFIG_NL80211_FASTSCAN
-
 /*----------------------------------------------------------------------------*/
 /*!
  * @brief This routine is responsible for adding a station information
@@ -944,10 +914,6 @@ mtk_cfg80211_scan (
     prGlueInfo = (P_GLUE_INFO_T) wiphy_priv(wiphy);
     ASSERT(prGlueInfo);
 
-#ifdef CONFIG_NL80211_FASTSCAN
-	printk("%s:receive scan command from user space\n",__func__);
-#endif
-
 	DBGLOG(REQ, INFO, ("mtk_cfg80211_scan\n"));
     kalMemZero(&rScanRequest, sizeof(PARAM_SCAN_REQUEST_EXT_T));
     
diff --git a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_init.c b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_init.c
index 8ec822f09..468dab2e4 100644
--- a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_init.c
+++ b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_init.c
@@ -892,9 +892,6 @@ static struct cfg80211_ops mtk_wlan_ops = {
     #ifdef CONFIG_NL80211_TESTMODE
     .testmode_cmd               = mtk_cfg80211_testmode_cmd,
     #endif
-	#ifdef CONFIG_NL80211_FASTSCAN
-	.fastscan_cmd                  = meizu_cfg80211_fastscan_cmd,
-	#endif
 #if (CFG_SUPPORT_TDLS == 1)
 	.tdls_mgmt					= TdlsexCfg80211TdlsMgmt,
 	.tdls_oper					= TdlsexCfg80211TdlsOper,
diff --git a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/include/gl_cfg80211.h b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/include/gl_cfg80211.h
index c591196b9..d71b4bbfa 100644
--- a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/include/gl_cfg80211.h
+++ b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/include/gl_cfg80211.h
@@ -261,10 +261,6 @@ mtk_cfg80211_del_station (
     u8 *mac
     );
 
-#ifdef CONFIG_NL80211_FASTSCAN
-int meizu_cfg80211_fastscan_cmd(struct wiphy *,void *,int);
-#endif
-
 int 
 mtk_cfg80211_scan (
     struct wiphy *wiphy,
diff --git a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/include/gl_os.h b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/include/gl_os.h
index 7c6de2a14..84f63038c 100644
--- a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/include/gl_os.h
+++ b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/include/gl_os.h
@@ -907,10 +907,6 @@ struct _GLUE_INFO_T {
     UINT_16                 u2WSCIELen;
     UINT_8                  aucWSCAssocInfoIE[200]; /*for Assoc req*/
     UINT_16                 u2WSCAssocInfoIELen;
-#ifdef CONFIG_NL80211_FASTSCAN
-	char                    prio_ssid[10][32];
-	int                     first_time_scan;
-#endif
 
 #if CFG_SUPPORT_HOTSPOT_2_0
     UINT_8                  aucHS20AssocInfoIE[200]; /*for Assoc req*/