Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5af6b85b authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove useless comment 



This patch removes useless comment that is included "BugID_xxxx"

Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 62f463a8

drivers/staging/wilc1000/host_interface.c

+0 −36
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ extern u8 connecting; 
extern struct timer_list hDuringIpTimer;

#endif



/*BugID_5137*/

extern u8 g_wilc_initialized;

/*****************************************************************************/

/*								Macros                                       */
@@ -173,7 +172,6 @@ typedef struct _tstrHostIFscanAttr { 
	size_t IEsLen;

	tWILCpfScanResult pfScanResult;

	void *pvUserArg;

	/*BugID_4189*/

	tstrHiddenNetwork strHiddenNetwork;



} tstrHostIFscanAttr;
@@ -563,7 +561,6 @@ static u32 gu32InactiveTime; 
static u8 gu8DelBcn;

static u32 gu32WidConnRstHack;



/*BugID_5137*/

u8 *gu8FlushedJoinReq;

u8 *gu8FlushedInfoElemAsoc;

u8 gu8Flushed11iMode;
@@ -888,7 +885,6 @@ static s32 Handle_SetMacAddress(tstrWILC_WFIDrv *drvHandler, tstrHostIfSetMacAdd 
}





/*BugID_5213*/

/**

 *  @brief Handle_GetMacAddress

 *  @details    Getting mac address
@@ -1330,7 +1326,6 @@ static s32 Handle_Scan(tstrWILC_WFIDrv *drvHandler, tstrHostIFscanAttr *pstrHost 


	pstrWFIDrv->strWILC_UsrScanReq.u32RcvdChCount = 0;



	/*BugID_4189*/

	strWIDList[u32WidsCount].u16WIDid = (u16)WID_SSID_PROBE_REQ;

	strWIDList[u32WidsCount].enuWIDtype = WID_STR;
@@ -1474,7 +1469,6 @@ static s32 Handle_ScanDone(tstrWILC_WFIDrv *drvHandler, tenuScanEvent enuEvent) 


	PRINT_D(HOSTINF_DBG, "in Handle_ScanDone()\n");



	/*BugID_4978*/

	/*Ask FW to abort the running scan, if any*/

	if (enuEvent == SCAN_EVENT_ABORTED) {

		PRINT_D(GENERIC_DBG, "Abort running scan\n");
@@ -1772,7 +1766,6 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *ps 
		strWIDList[u32WidsCount].s32ValueSize = pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen;

		u32WidsCount++;



		/*BugID_5137*/

		if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {



			gu32FlushedInfoElemAsocSize = pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen;
@@ -1787,7 +1780,6 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *ps 
	strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrWFIDrv->strWILC_UsrConnReq.u8security));

	u32WidsCount++;



	/*BugID_5137*/

	if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7))

		gu8Flushed11iMode = pstrWFIDrv->strWILC_UsrConnReq.u8security;
@@ -1800,7 +1792,6 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *ps 
	strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type);

	u32WidsCount++;



	/*BugID_5137*/

	if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7))

		gu8FlushedAuthType = (u8)pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type;
@@ -1857,7 +1848,6 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *ps 
	strWIDList[u32WidsCount].s32ValueSize = 112; /* 79; */

	strWIDList[u32WidsCount].ps8WidVal = kmalloc(strWIDList[u32WidsCount].s32ValueSize, GFP_KERNEL);



	/*BugID_5137*/

	if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {

		gu32FlushedJoinReqSize = strWIDList[u32WidsCount].s32ValueSize;

		gu8FlushedJoinReq = kmalloc(gu32FlushedJoinReqSize, GFP_KERNEL);
@@ -1943,7 +1933,6 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *ps 
	memcpy(pu8CurrByte, ptstrJoinBssParam->rsn_cap, sizeof(ptstrJoinBssParam->rsn_cap));

	pu8CurrByte += sizeof(ptstrJoinBssParam->rsn_cap);



	/*BugID_5137*/

	*(pu8CurrByte++) = REAL_JOIN_REQ;



	*(pu8CurrByte++) = ptstrJoinBssParam->u8NoaEnbaled;
@@ -1993,7 +1982,6 @@ static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr *ps 
	gu32WidConnRstHack = 0;

	/* ////////////////////// */



	/*BugID_5137*/

	if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {

		memcpy(gu8FlushedJoinReq, pu8CurrByte, gu32FlushedJoinReqSize);

		gu8FlushedJoinReqDrvHandler = pstrWFIDrv;
@@ -2244,7 +2232,6 @@ static s32 Handle_ConnectTimeout(tstrWILC_WFIDrv *drvHandler) 
	}



	memset(u8ConnectedSSID, 0, ETH_ALEN);

	/*BugID_5213*/

	/*Freeing flushed join request params on connect timeout*/

	if (gu8FlushedJoinReq != NULL && gu8FlushedJoinReqDrvHandler == drvHandler) {

		kfree(gu8FlushedJoinReq);
@@ -2666,7 +2653,6 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler, tstrRcvdGnrlAsy 
				pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs = NULL;

			}



			/*BugID_5213*/

			/*Freeing flushed join request params on receiving*/

			/*MAC_DISCONNECTED while connected*/

			if (gu8FlushedJoinReq != NULL && gu8FlushedJoinReqDrvHandler == drvHandler) {
@@ -3125,7 +3111,6 @@ static void Handle_Disconnect(tstrWILC_WFIDrv *drvHandler) 


		if (pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult != NULL)	{



			/*BugID_5193*/

			/*Stop connect timer, if connection in progress*/

			if (pstrWFIDrv->enuHostIFstate == HOST_IF_WAITING_CONN_RESP) {

				PRINT_D(HOSTINF_DBG, "Upper layer requested termination of connection\n");
@@ -3164,7 +3149,6 @@ static void Handle_Disconnect(tstrWILC_WFIDrv *drvHandler) 
		}





		/*BugID_5137*/

		if (gu8FlushedJoinReq != NULL && gu8FlushedJoinReqDrvHandler == drvHandler) {

			kfree(gu8FlushedJoinReq);

			gu8FlushedJoinReq = NULL;
@@ -3931,7 +3915,6 @@ static u32 Handle_ListenStateExpired(tstrWILC_WFIDrv *drvHandler, tstrHostIfRema 


	PRINT_D(HOSTINF_DBG, "CANCEL REMAIN ON CHAN\n");



	/*BugID_5477*/

	/*Make sure we are already in listen state*/

	/*This is to handle duplicate expiry messages (listen timer fired and supplicant called cancel_remain_on_channel())*/

	if (P2P_LISTEN_STATE) {
@@ -4084,7 +4067,6 @@ static void Handle_SetMulticastFilter(tstrWILC_WFIDrv *drvHandler, tstrHostIFSet 
}





/*BugID_5222*/

/**

 *  @brief                      Handle_AddBASession

 *  @details            Add block ack session
@@ -4174,7 +4156,6 @@ static s32 Handle_AddBASession(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASessionI 
}





/*BugID_5222*/

/**

 *  @brief                      Handle_DelBASession

 *  @details            Delete block ack session
@@ -4239,7 +4220,6 @@ static s32 Handle_DelBASession(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASessionI 
	if (strWID.ps8WidVal != NULL)

		kfree(strWID.ps8WidVal);



	/*BugID_5222*/

	up(&hWaitResponse);



	return s32Error;
@@ -4294,7 +4274,6 @@ static s32 Handle_DelAllRxBASessions(tstrWILC_WFIDrv *drvHandler, tstrHostIfBASe 
	if (strWID.ps8WidVal != NULL)

		kfree(strWID.ps8WidVal);



	/*BugID_5222*/

	up(&hWaitResponse);



	return s32Error;
@@ -4355,7 +4334,6 @@ static int hostIFthread(void *pvArg) 
			Handle_Connect(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr);

			break;



		/*BugID_5137*/

		case HOST_IF_MSG_FLUSH_CONNECT:

			Handle_FlushConnect(strHostIFmsg.drvHandler);

			break;
@@ -4389,7 +4367,6 @@ static int hostIFthread(void *pvArg) 
			del_timer(&pstrWFIDrv->hScanTimer);

			PRINT_D(HOSTINF_DBG, "scan completed successfully\n");



			/*BugID_5213*/

			/*Allow chip sleep, only if both interfaces are not connected*/

			if (!linux_wlan_get_num_conn_ifcs())

				chip_sleep_manually(INFINITE_SLEEP_TIME);
@@ -4475,12 +4452,10 @@ static int hostIFthread(void *pvArg) 
			Handle_get_IPAddress(strHostIFmsg.drvHandler, strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.au8IPAddr, strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.idx);

			break;



		/*BugID_5077*/

		case HOST_IF_MSG_SET_MAC_ADDRESS:

			Handle_SetMacAddress(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfSetMacAddress);

			break;



		/*BugID_5213*/

		case HOST_IF_MSG_GET_MAC_ADDRESS:

			Handle_GetMacAddress(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfGetMacAddress);

			break;
@@ -4504,7 +4479,6 @@ static int hostIFthread(void *pvArg) 
			Handle_SetMulticastFilter(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfSetMulti);

			break;



		/*BugID_5222*/

		case HOST_IF_MSG_ADD_BA_SESSION:

			Handle_AddBASession(strHostIFmsg.drvHandler, &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo);

			break;
@@ -6421,7 +6395,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv) 
	if (clients_count == 0)	{

		sema_init(&hSemHostIFthrdEnd, 0);

		sema_init(&hSemDeinitDrvHandle, 0);

		/*BugID_5348*/

		sema_init(&hSemHostIntDeinit, 1);

	}
@@ -6544,7 +6517,6 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv) 
	 *      return 0;

	 * }*/



	/*BugID_5348*/



	if (pstrWFIDrv == NULL)	{

		PRINT_ER("pstrWFIDrv = NULL\n");
@@ -6556,7 +6528,6 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv) 
	terminated_handle = pstrWFIDrv;

	PRINT_D(HOSTINF_DBG, "De-initializing host interface for client %d\n", clients_count);



	/*BugID_5348*/

	/*Destroy all timers before acquiring hSemDeinitDrvHandle*/

	/*to guarantee handling all messages befor proceeding*/

	if (del_timer_sync(&pstrWFIDrv->hScanTimer)) {
@@ -6703,7 +6674,6 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length) 
	int id;

	tstrWILC_WFIDrv *pstrWFIDrv = NULL;



	/*BugID_5348*/

	down(&hSemHostIntDeinit);



	id = ((pu8Buffer[u32Length - 4]) | (pu8Buffer[u32Length - 3] << 8) | (pu8Buffer[u32Length - 2] << 16) | (pu8Buffer[u32Length - 1] << 24));
@@ -6713,7 +6683,6 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length) 


	if (pstrWFIDrv == NULL || pstrWFIDrv == terminated_handle) {

		PRINT_D(HOSTINF_DBG, "Wifi driver handler is equal to NULL\n");

		/*BugID_5348*/

		up(&hSemHostIntDeinit);

		return;

	}
@@ -6721,7 +6690,6 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length) 
	if (pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult == NULL) {

		/* received mac status is not needed when there is no current Connect Request */

		PRINT_ER("Received mac status is not needed when there is no current Connect Reques\n");

		/*BugID_5348*/

		up(&hSemHostIntDeinit);

		return;

	}
@@ -6744,7 +6712,6 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length) 
	if (s32Error)

		PRINT_ER("Error in sending message queue asynchronous message info: Error(%d)\n", s32Error);



	/*BugID_5348*/

	up(&hSemHostIntDeinit);

}
@@ -7126,7 +7093,6 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr) 
	strHostIFmsg.u16MsgId = HOST_IF_MSG_DEL_STATION;

	strHostIFmsg.drvHandler = hWFIDrv;



	/*BugID_4795: Handling situation of deleting all stations*/

	if (pu8MacAddr == NULL)

		memset(pstrDelStationMsg->au8MacAddr, 255, ETH_ALEN);

	else
@@ -7604,7 +7570,6 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char TID) 
	if (s32Error)

		PRINT_ER("wilc_mq_send fail\n");



	/*BugID_5222*/

	down(&hWaitResponse);



	return s32Error;
@@ -7635,7 +7600,6 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv *hWFIDrv, char *pBSSID, char T 
	if (s32Error)

		PRINT_ER("wilc_mq_send fail\n");



	/*BugID_5222*/

	down(&hWaitResponse);



	return s32Error;

drivers/staging/wilc1000/host_interface.h

+0 −4
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ typedef struct _tstrRcvdNetworkInfo { 
	u32 u32Length;

} tstrRcvdNetworkInfo;



/*BugID_4156*/

typedef struct _tstrHiddenNetworkInfo {

	u8  *pu8ssid;

	u8 u8ssidlen;
@@ -264,17 +263,14 @@ typedef struct { 
	u32 u32Mode;

} tstrHostIfSetOperationMode;



/*BugID_5077*/

typedef struct {

	u8 u8MacAddress[ETH_ALEN];

} tstrHostIfSetMacAddress;



/*BugID_5213*/

typedef struct {

	u8 *u8MacAddress;

} tstrHostIfGetMacAddress;



/*BugID_5222*/

typedef struct {

	u8 au8Bssid[ETH_ALEN];

	u8 u8Ted;

drivers/staging/wilc1000/linux_wlan.c

+0 −8
Original line number Diff line number Diff line
@@ -572,7 +572,6 @@ int linux_wlan_set_bssid(struct net_device *wilc_netdev, u8 *pBSSID) 
	return ret;

}



/*BugID_5213*/

/*Function to get number of connected interfaces*/

int linux_wlan_get_num_conn_ifcs(void)

{
@@ -679,7 +678,6 @@ int linux_wlan_get_firmware(perInterface_wlan_t *p_nic) 
	else if (nic->iftype == STATION_MODE)

		firmware = STA_FIRMWARE;



	/*BugID_5137*/

	else {

		PRINT_D(INIT_DBG, "Get P2P_CONCURRENCY_FIRMWARE\n");

		firmware = P2P_CONCURRENCY_FIRMWARE;
@@ -800,7 +798,6 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n 
	unsigned char c_val[64];

	unsigned char mac_add[] = {0x00, 0x80, 0xC2, 0x5E, 0xa2, 0xff};



	/*BugID_5077*/

	struct wilc_priv *priv;

	tstrWILC_WFIDrv *pstrWFIDrv;
@@ -1147,7 +1144,6 @@ int wlan_init_locks(linux_wlan_t *p_nic) 
	mutex_init(&g_linux_wlan->rxq_cs);

	mutex_init(&g_linux_wlan->txq_cs);



	/*Added by Amr - BugID_4720*/

	spin_lock_init(&g_linux_wlan->txq_spinlock);

	sema_init(&g_linux_wlan->txq_add_to_head_cs, 1);
@@ -1190,10 +1186,8 @@ void linux_to_wlan(wilc_wlan_inp_t *nwi, linux_wlan_t *nic) 
	nwi->os_context.tx_buffer_size = LINUX_TX_SIZE;

	nwi->os_context.txq_critical_section = (void *)&g_linux_wlan->txq_cs;



	/*Added by Amr - BugID_4720*/

	nwi->os_context.txq_add_to_head_critical_section = (void *)&g_linux_wlan->txq_add_to_head_cs;



	/*Added by Amr - BugID_4720*/

	nwi->os_context.txq_spin_lock = (void *)&g_linux_wlan->txq_spinlock;



	nwi->os_context.txq_wait_event = (void *)&g_linux_wlan->txq_event;
@@ -1559,7 +1553,6 @@ int mac_open(struct net_device *ndev) 
{

	perInterface_wlan_t *nic;



	/*BugID_5213*/

	/*No need for setting mac address here anymore,*/

	/*Just set it in init_test_config()*/

	unsigned char mac_add[ETH_ALEN] = {0};
@@ -1969,7 +1962,6 @@ void WILC_WFI_mgmt_rx(u8 *buff, u32 size) 
	int i = 0;

	perInterface_wlan_t *nic;



	/*BugID_5450*/

	/*Pass the frame on the monitor interface, if any.*/

	/*Otherwise, pass it on p2p0 netdev, if registered on it*/

	for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {

drivers/staging/wilc1000/linux_wlan_common.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ enum debug_region { 
	RX_debug,

	Lock_debug,

	Tcp_enhance,

	/*Added by amr - BugID_4720*/

	Spin_debug,



	Init_debug,

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+0 −42
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ struct timer_list hAgingTimer; 
static u8 op_ifcs;

extern u8 u8ConnectedSSID[6];



/*BugID_5137*/

u8 g_wilc_initialized = 1;

extern linux_wlan_t *g_linux_wlan;

#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
@@ -102,7 +101,6 @@ struct p2p_mgmt_data { 
/*Global variable used to state the current  connected STA channel*/

u8 u8WLANChannel = INVALID_CHANNEL;



/*BugID_5442*/

u8 u8CurrChannel;



u8 u8P2P_oui[] = {0x50, 0x6f, 0x9A, 0x09};
@@ -119,7 +117,6 @@ static struct ieee80211_supported_band WILC_WFI_band_2ghz = { 
};





/*BugID_5137*/

struct add_key_params {

	u8 key_idx;

	bool pairwise;
@@ -573,7 +570,6 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, 
			linux_wlan_set_bssid(priv->dev, NullBssid);

			memset(u8ConnectedSSID, 0, ETH_ALEN);



			/*BugID_5457*/

			/*Invalidate u8WLANChannel value on wlan0 disconnect*/

			if (!pstrWFIDrv->u8P2PConnect)

				u8WLANChannel = INVALID_CHANNEL;
@@ -589,9 +585,6 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, 
				   pstrConnectInfo->au8bssid[1], pstrConnectInfo->au8bssid[2], pstrConnectInfo->au8bssid[3], pstrConnectInfo->au8bssid[4], pstrConnectInfo->au8bssid[5]);

			memcpy(priv->au8AssociatedBss, pstrConnectInfo->au8bssid, ETH_ALEN);



			/* BugID_4209: if this network has expired in the scan results in the above nl80211 layer, refresh them here by calling

			 *  cfg80211_inform_bss() with the last Scan results before calling cfg80211_connect_result() to avoid

			 *  Linux kernel warning generated at the nl80211 layer */



			for (i = 0; i < u32LastScannedNtwrksCountShadow; i++) {

				if (memcmp(astrLastScannedNtwrksShadow[i].au8bssid,
@@ -608,7 +601,6 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, 
			}



			if (bNeedScanRefresh) {

				/*BugID_5418*/

				/*Also, refrsh DIRECT- results if */

				refresh_scan(priv, 1, true);
@@ -639,17 +631,14 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, 
		linux_wlan_set_bssid(priv->dev, NullBssid);

		memset(u8ConnectedSSID, 0, ETH_ALEN);



		/*BugID_5457*/

		/*Invalidate u8WLANChannel value on wlan0 disconnect*/

		if (!pstrWFIDrv->u8P2PConnect)

			u8WLANChannel = INVALID_CHANNEL;

		/*BugID_5315*/

		/*Incase "P2P CLIENT Connected" send deauthentication reason by 3 to force the WPA_SUPPLICANT to directly change

		 *      virtual interface to station*/

		if ((pstrWFIDrv->IFC_UP) && (dev == g_linux_wlan->strInterfaceInfo[1].wilc_netdev)) {

			pstrDisconnectNotifInfo->u16reason = 3;

		}

		/*BugID_5315*/

		/*Incase "P2P CLIENT during connection(not connected)" send deauthentication reason by 1 to force the WPA_SUPPLICANT

		 *      to scan again and retry the connection*/

		else if ((!pstrWFIDrv->IFC_UP) && (dev == g_linux_wlan->strInterfaceInfo[1].wilc_netdev)) {
@@ -755,7 +744,6 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) 
			strHiddenNetwork.u8ssidnum = request->n_ssids;





			/*BugID_4156*/

			for (i = 0; i < request->n_ssids; i++) {



				if (request->ssids[i].ssid != NULL && request->ssids[i].ssid_len != 0) {
@@ -911,7 +899,6 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, 
			priv->WILC_WFI_wep_key_len[sme->key_idx] = sme->key_len;

			memcpy(priv->WILC_WFI_wep_key[sme->key_idx], sme->key, sme->key_len);



			/*BugID_5137*/

			g_key_wep_params.key_len = sme->key_len;

			g_key_wep_params.key = kmalloc(sme->key_len, GFP_KERNEL);

			memcpy(g_key_wep_params.key, sme->key, sme->key_len);
@@ -929,7 +916,6 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, 
			priv->WILC_WFI_wep_key_len[sme->key_idx] = sme->key_len;

			memcpy(priv->WILC_WFI_wep_key[sme->key_idx], sme->key, sme->key_len);



			/*BugID_5137*/

			g_key_wep_params.key_len = sme->key_len;

			g_key_wep_params.key = kmalloc(sme->key_len, GFP_KERNEL);

			memcpy(g_key_wep_params.key, sme->key, sme->key_len);
@@ -1023,7 +1009,6 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, 
	PRINT_INFO(CFG80211_DBG, "Group encryption value = %s\n Cipher Group = %s\n WPA version = %s\n",

		   pcgroup_encrypt_val, pccipher_group, pcwpa_version);



	/*BugID_5442*/

	u8CurrChannel = pstrNetworkInfo->u8channel;



	if (!pstrWFIDrv->u8P2PConnect) {
@@ -1068,7 +1053,6 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_co 
	connecting = 0;

	priv = wiphy_priv(wiphy);



	/*BugID_5457*/

	/*Invalidate u8WLANChannel value on wlan0 disconnect*/

	pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv;

	if (!pstrWFIDrv->u8P2PConnect)
@@ -1120,7 +1104,6 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, 


	PRINT_D(CFG80211_DBG, "Adding key with cipher suite = %x\n", params->cipher);



	/*BugID_5137*/

	PRINT_D(CFG80211_DBG, "%p %p %d\n", wiphy, netdev, key_index);



	PRINT_D(CFG80211_DBG, "key %x %x %x\n", params->key[0],
@@ -1292,7 +1275,6 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, 
					KeyLen = params->key_len - 16;

				}



				/*BugID_5137*/

				/*save keys only on interface 0 (wifi interface)*/

				if (!g_gtk_keys_saved && netdev == g_linux_wlan->strInterfaceInfo[0].wilc_netdev) {

					g_add_gtk_key_params.key_idx = key_index;
@@ -1329,7 +1311,6 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, 
					KeyLen = params->key_len - 16;

				}



				/*BugID_5137*/

				/*save keys only on interface 0 (wifi interface)*/

				if (!g_ptk_keys_saved && netdev == g_linux_wlan->strInterfaceInfo[0].wilc_netdev) {

					g_add_ptk_key_params.key_idx = key_index;
@@ -1396,7 +1377,6 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev, 


	priv = wiphy_priv(wiphy);



	/*BugID_5137*/

	/*delete saved keys, if any*/

	if (netdev == g_linux_wlan->strInterfaceInfo[0].wilc_netdev) {

		g_ptk_keys_saved = false;
@@ -1987,7 +1967,6 @@ void WILC_WFI_CfgParseRxAction(u8 *buf, u32 len) 
	u32 index = 0;

	u32 i = 0, j = 0;



	/*BugID_5460*/

	u8 op_channel_attr_index = 0;

	u8 channel_list_attr_index = 0;
@@ -2131,7 +2110,6 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, u32 size) 


		PRINT_D(GENERIC_DBG, "Rx Frame Type:%x\n", buff[FRAME_TYPE_ID]);



		/*BugID_5442*/

		/*Upper layer is informed that the frame is received on this freq*/

		s32Freq = ieee80211_channel_to_frequency(u8CurrChannel, IEEE80211_BAND_2GHZ);
@@ -2265,7 +2243,6 @@ static void WILC_WFI_RemainOnChannelExpired(void *pUserVoid, u32 u32SessionID) 


	priv = (struct wilc_priv *)pUserVoid;



	/*BugID_5477*/

	if (u32SessionID == priv->strRemainOnChanParams.u32ListenSessionID) {

		PRINT_D(GENERIC_DBG, "Remain on channel expired\n");
@@ -2308,9 +2285,6 @@ static int remain_on_channel(struct wiphy *wiphy, 


	PRINT_D(GENERIC_DBG, "Remaining on channel %d\n", chan->hw_value);



	/*BugID_4800: if in AP mode, return.*/

	/*This check is to handle the situation when user*/

	/*requests "create group" during a running scan*/



	if (wdev->iftype == NL80211_IFTYPE_AP) {

		PRINT_D(GENERIC_DBG, "Required remain-on-channel while in AP mode");
@@ -2443,9 +2417,7 @@ int mgmt_tx(struct wiphy *wiphy, 
			PRINT_D(GENERIC_DBG, "ACTION FRAME:%x\n", (u16)mgmt->frame_control);





			/*BugID_4847*/

			if (buf[ACTION_CAT_ID] == PUB_ACTION_ATTR_ID) {

				/*BugID_4847*/

				/*Only set the channel, if not a negotiation confirmation frame

				 * (If Negotiation confirmation frame, force it

				 * to be transmitted on the same negotiation channel)*/
@@ -2495,7 +2467,6 @@ int mgmt_tx(struct wiphy *wiphy, 
										if (buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_RSP)

											WILC_WFI_CfgParseTxAction(&mgmt_tx->buff[i + 6], len - (i + 6), true, nic->iftype);



										/*BugID_5460*/

										/*If using supplicant go intent, no need at all*/

										/*to parse transmitted negotiation frames*/

										else
@@ -2594,7 +2565,6 @@ void WILC_WFI_frame_register(struct wiphy *wiphy, 






	/*BugID_5137*/

	if (!frame_type)

		return;
@@ -2754,7 +2724,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 
	del_timer(&hDuringIpTimer);

	PRINT_D(GENERIC_DBG, "Changing virtual interface, enable scan\n");

	#endif

	/*BugID_5137*/

	/*Set WILC_CHANGING_VIR_IF register to disallow adding futrue keys to CE H/W*/

	if (g_ptk_keys_saved && g_gtk_keys_saved) {

		Set_machw_change_vir_if(true);
@@ -2783,7 +2752,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 
			/* ensure that the message Q is empty */

			host_int_wait_msg_queue_idle();



			/*BugID_5213*/

			/*Eliminate host interface blocking state*/

			up(&g_linux_wlan->cfg_event);
@@ -2835,8 +2803,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 
					(struct key_params *)(&g_key_gtk_params));

			}



			/*BugID_4847: registered frames in firmware are now*/

			/*lost due to mac close. So re-register those frames*/

			if (g_linux_wlan->wilc1000_initialized)	{

				for (i = 0; i < num_reg_frame; i++) {

					PRINT_D(INIT_DBG, "Frame registering Type: %x - Reg: %d\n", nic->g_struct_frame_reg[i].frame_type,
@@ -2922,8 +2888,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 
			refresh_scan(priv, 1, true);

			Set_machw_change_vir_if(false);



			/*BugID_4847: registered frames in firmware are now lost

			 *  due to mac close. So re-register those frames */

			if (g_linux_wlan->wilc1000_initialized)	{

				for (i = 0; i < num_reg_frame; i++) {

					PRINT_D(INIT_DBG, "Frame registering Type: %x - Reg: %d\n", nic->g_struct_frame_reg[i].frame_type,
@@ -2953,8 +2917,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 
			mac_close(dev);

			mac_open(dev);



			/*BugID_4847: registered frames in firmware are now lost

			 * due to mac close. So re-register those frames */

			for (i = 0; i < num_reg_frame; i++) {

				PRINT_D(INIT_DBG, "Frame registering Type: %x - Reg: %d\n", nic->g_struct_frame_reg[i].frame_type,

					nic->g_struct_frame_reg[i].reg);
@@ -2973,7 +2935,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 
		mod_timer(&hDuringIpTimer, jiffies + msecs_to_jiffies(duringIP_TIME));

		#endif

		host_int_set_power_mgmt(priv->hWILCWFIDrv, 0, 0);

		/*BugID_5222*/

		/*Delete block ack has to be the latest config packet*/

		/*sent before downloading new FW. This is because it blocks on*/

		/*hWaitResponse semaphore, which allows previous config*/
@@ -3047,8 +3008,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 
		}

		#endif



		/*BugID_4847: registered frames in firmware are now*/

		/*lost due to mac close. So re-register those frames*/

		if (g_linux_wlan->wilc1000_initialized)	{

			for (i = 0; i < num_reg_frame; i++) {

				PRINT_D(INIT_DBG, "Frame registering Type: %x - Reg: %d\n", nic->g_struct_frame_reg[i].frame_type,
@@ -3178,7 +3137,6 @@ static int stop_ap(struct wiphy *wiphy, struct net_device *dev) 


	PRINT_D(HOSTAPD_DBG, "Deleting beacon\n");



	/*BugID_5188*/

	linux_wlan_set_bssid(dev, NullBssid);



	s32Error = host_int_del_beacon(priv->hWILCWFIDrv);