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

Commit 03362286 authored by Tony Cho's avatar Tony Cho Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove bool bRespRequired from send_config_pkt 



This patch removes 4th parameter, bool bRespRequired from the
send_config_pkt function because it is not used inside the funcntion.

Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aaed3290

drivers/staging/wilc1000/coreconfigurator.c

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ s32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo) 
 *  @version	1.0

 */

s32 send_config_pkt(u8 u8Mode, tstrWID *pstrWIDs,

		    u32 u32WIDsCount, bool bRespRequired, u32 drvHandler)

		    u32 u32WIDsCount, u32 drvHandler)

{

	s32 counter = 0, ret = 0;

drivers/staging/wilc1000/coreconfigurator.h

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ typedef struct { 
} tstrDisconnectNotifInfo;



s32 send_config_pkt(u8 u8Mode, tstrWID *pstrWIDs,

		    u32 u32WIDsCount, bool bRespRequired, u32 drvHandler);

		    u32 u32WIDsCount, u32 drvHandler);

s32 parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo);

s32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo);

drivers/staging/wilc1000/host_interface.c

+45 −45
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static s32 Handle_SetChannel(struct host_if_drv *drvHandler, 


	PRINT_D(HOSTINF_DBG, "Setting channel\n");

	/*Sending Cfg*/

	s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error) {

		PRINT_ER("Failed to set channel\n");
@@ -619,7 +619,7 @@ static s32 Handle_SetWfiDrvHandler(struct host_if_drv *drvHandler, 


	/*Sending Cfg*/



	s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   pstrHostIfSetDrvHandler->u32Address);



	if (pstrWFIDrv == NULL)
@@ -661,7 +661,7 @@ static s32 Handle_SetOperationMode(struct host_if_drv *drvHandler, 
	/*Sending Cfg*/

	PRINT_INFO(HOSTINF_DBG, "pstrWFIDrv= %p\n", pstrWFIDrv);



	s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));
@@ -707,7 +707,7 @@ s32 Handle_set_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx) 
	strWID.ps8WidVal = (u8 *)pu8IPAddr;

	strWID.s32ValueSize = IP_ALEN;



	s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));
@@ -746,7 +746,7 @@ s32 Handle_get_IPAddress(struct host_if_drv *drvHandler, u8 *pu8IPAddr, u8 idx) 
	strWID.ps8WidVal = kmalloc(IP_ALEN, GFP_KERNEL);

	strWID.s32ValueSize = IP_ALEN;



	s32Error = send_config_pkt(GET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(GET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));



	PRINT_INFO(HOSTINF_DBG, "%pI4\n", strWID.ps8WidVal);
@@ -803,7 +803,7 @@ static s32 Handle_SetMacAddress(struct host_if_drv *drvHandler, 
	strWID.s32ValueSize = ETH_ALEN;

	PRINT_D(GENERIC_DBG, "mac addr = :%pM\n", strWID.ps8WidVal);

	/*Sending Cfg*/

	s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error) {

		PRINT_ER("Failed to set mac address\n");
@@ -838,7 +838,7 @@ static s32 Handle_GetMacAddress(struct host_if_drv *drvHandler, 
	strWID.s32ValueSize = ETH_ALEN;



	/*Sending Cfg*/

	s32Error = send_config_pkt(GET_CFG, &strWID, 1, false,

	s32Error = send_config_pkt(GET_CFG, &strWID, 1,

				   get_id_from_handler(drvHandler));

	if (s32Error) {

		PRINT_ER("Failed to get mac address\n");
@@ -1180,7 +1180,7 @@ static s32 Handle_CfgParam(struct host_if_drv *drvHandler, 
		}

		u8WidCnt++;

	}

	s32Error = send_config_pkt(SET_CFG, strWIDList, u8WidCnt, false,

	s32Error = send_config_pkt(SET_CFG, strWIDList, u8WidCnt,

				   get_id_from_handler(pstrWFIDrv));



	if (s32Error)
@@ -1332,7 +1332,7 @@ static s32 Handle_Scan(struct host_if_drv *drvHandler, 
	else if (pstrWFIDrv->enuHostIFstate == HOST_IF_IDLE)

		gbScanWhileConnected = false;



	s32Error = send_config_pkt(SET_CFG, strWIDList, u32WidsCount, false,

	s32Error = send_config_pkt(SET_CFG, strWIDList, u32WidsCount,

				   get_id_from_handler(pstrWFIDrv));



	if (s32Error)
@@ -1407,7 +1407,7 @@ static s32 Handle_ScanDone(struct host_if_drv *drvHandler, tenuScanEvent enuEven 
		strWID.s32ValueSize = sizeof(char);



		/*Sending Cfg*/

		s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

		s32Error = send_config_pkt(SET_CFG, &strWID, 1,

					   get_id_from_handler(pstrWFIDrv));

		if (s32Error) {

			PRINT_ER("Failed to set abort running scan\n");
@@ -1718,7 +1718,7 @@ static s32 Handle_Connect(struct host_if_drv *drvHandler, 
		PRINT_D(GENERIC_DBG, "save bssid = %pM\n", u8ConnectedSSID);

	}



	s32Error = send_config_pkt(SET_CFG, strWIDList, u32WidsCount, false,

	s32Error = send_config_pkt(SET_CFG, strWIDList, u32WidsCount,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error) {

		PRINT_ER("failed to send config packet\n");
@@ -1844,7 +1844,7 @@ static s32 Handle_FlushConnect(struct host_if_drv *drvHandler) 


	u32WidsCount++;



	s32Error = send_config_pkt(SET_CFG, strWIDList, u32WidsCount, false,

	s32Error = send_config_pkt(SET_CFG, strWIDList, u32WidsCount,

				   get_id_from_handler(gu8FlushedJoinReqDrvHandler));

	if (s32Error) {

		PRINT_ER("failed to send config packet\n");
@@ -1925,7 +1925,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv *drvHandler) 


	PRINT_D(HOSTINF_DBG, "Sending disconnect request\n");



	s32Error = send_config_pkt(SET_CFG, &strWID, 1, false,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error)

		PRINT_ER("Failed to send dissconect config packet\n");
@@ -2462,7 +2462,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, 
			strWIDList[3].ps8WidVal = (s8 *)pu8keybuf;





			s32Error = send_config_pkt(SET_CFG, strWIDList, 4, true,

			s32Error = send_config_pkt(SET_CFG, strWIDList, 4,

						   get_id_from_handler(pstrWFIDrv));

			kfree(pu8keybuf);
@@ -2490,7 +2490,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, 
			strWID.ps8WidVal	= (s8 *)pu8keybuf;

			strWID.s32ValueSize = pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen + 2;



			s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

			s32Error = send_config_pkt(SET_CFG, &strWID, 1,

						   get_id_from_handler(pstrWFIDrv));

			kfree(pu8keybuf);

		} else if (pstrHostIFkeyAttr->u8KeyAction & REMOVEKEY)	  {
@@ -2503,7 +2503,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, 
			strWID.ps8WidVal = s8idxarray;

			strWID.s32ValueSize = 1;



			s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

			s32Error = send_config_pkt(SET_CFG, &strWID, 1,

						   get_id_from_handler(pstrWFIDrv));

		} else {

			strWID.u16WIDid	= (u16)WID_KEY_ID;
@@ -2513,7 +2513,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, 


			PRINT_D(HOSTINF_DBG, "Setting default key index\n");



			s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

			s32Error = send_config_pkt(SET_CFG, &strWID, 1,

						   get_id_from_handler(pstrWFIDrv));

		}

		up(&(pstrWFIDrv->hSemTestKeyBlock));
@@ -2559,7 +2559,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, 
			strWIDList[1].ps8WidVal	= (s8 *)pu8keybuf;

			strWIDList[1].s32ValueSize = RX_MIC_KEY_MSG_LEN;



			s32Error = send_config_pkt(SET_CFG, strWIDList, 2, true,

			s32Error = send_config_pkt(SET_CFG, strWIDList, 2,

						   get_id_from_handler(pstrWFIDrv));



			kfree(pu8keybuf);
@@ -2605,7 +2605,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, 
			strWID.ps8WidVal	= (s8 *)pu8keybuf;

			strWID.s32ValueSize = RX_MIC_KEY_MSG_LEN;



			s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

			s32Error = send_config_pkt(SET_CFG, &strWID, 1,

						   get_id_from_handler(pstrWFIDrv));



			kfree(pu8keybuf);
@@ -2662,7 +2662,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, 
			strWIDList[1].ps8WidVal	= (s8 *)pu8keybuf;

			strWIDList[1].s32ValueSize = PTK_KEY_MSG_LEN + 1;



			s32Error = send_config_pkt(SET_CFG, strWIDList, 2, true,

			s32Error = send_config_pkt(SET_CFG, strWIDList, 2,

						   get_id_from_handler(pstrWFIDrv));

			kfree(pu8keybuf);
@@ -2703,7 +2703,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, 
			strWID.ps8WidVal	= (s8 *)pu8keybuf;

			strWID.s32ValueSize = PTK_KEY_MSG_LEN;



			s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

			s32Error = send_config_pkt(SET_CFG, &strWID, 1,

						   get_id_from_handler(pstrWFIDrv));

			kfree(pu8keybuf);
@@ -2743,7 +2743,7 @@ static int Handle_Key(struct host_if_drv *drvHandler, 
		strWID.ps8WidVal = (s8 *)pu8keybuf;

		strWID.s32ValueSize = (pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.numpmkid * PMKSA_KEY_LEN) + 1;



		s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

		s32Error = send_config_pkt(SET_CFG, &strWID, 1,

					   get_id_from_handler(pstrWFIDrv));



		kfree(pu8keybuf);
@@ -2790,7 +2790,7 @@ static void Handle_Disconnect(struct host_if_drv *drvHandler) 


	eth_zero_addr(u8ConnectedSSID);



	s32Error = send_config_pkt(SET_CFG, &strWID, 1, false,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));



	if (s32Error) {
@@ -2907,7 +2907,7 @@ static s32 Handle_GetChnl(struct host_if_drv *drvHandler) 


	PRINT_D(HOSTINF_DBG, "Getting channel value\n");



	s32Error = send_config_pkt(GET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(GET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	/*get the value by searching the local copy*/

	if (s32Error) {
@@ -2947,7 +2947,7 @@ static void Handle_GetRssi(struct host_if_drv *drvHandler) 
	/*Sending Cfg*/

	PRINT_D(HOSTINF_DBG, "Getting RSSI value\n");



	s32Error = send_config_pkt(GET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(GET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error) {

		PRINT_ER("Failed to get RSSI value\n");
@@ -2975,7 +2975,7 @@ static void Handle_GetLinkspeed(struct host_if_drv *drvHandler) 
	/*Sending Cfg*/

	PRINT_D(HOSTINF_DBG, "Getting LINKSPEED value\n");



	s32Error = send_config_pkt(GET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(GET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error) {

		PRINT_ER("Failed to get LINKSPEED value\n");
@@ -3022,7 +3022,7 @@ s32 Handle_GetStatistics(struct host_if_drv *drvHandler, tstrStatistics *pstrSta 
	strWIDList[u32WidsCount].ps8WidVal = (s8 *)(&(pstrStatistics->u32TxFailureCount));

	u32WidsCount++;



	s32Error = send_config_pkt(GET_CFG, strWIDList, u32WidsCount, false,

	s32Error = send_config_pkt(GET_CFG, strWIDList, u32WidsCount,

				   get_id_from_handler(drvHandler));



	if (s32Error)
@@ -3067,7 +3067,7 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler, 
	PRINT_D(CFG80211_DBG, "SETING STA inactive time\n");





	s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	/*get the value by searching the local copy*/

	if (s32Error) {
@@ -3082,7 +3082,7 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *drvHandler, 
	strWID.s32ValueSize = sizeof(u32);





	s32Error = send_config_pkt(GET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(GET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	/*get the value by searching the local copy*/

	if (s32Error) {
@@ -3159,7 +3159,7 @@ static void Handle_AddBeacon(struct host_if_drv *drvHandler, 




	/*Sending Cfg*/

	s32Error = send_config_pkt(SET_CFG, &strWID, 1, false,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error)

		PRINT_ER("Failed to send add beacon config packet\n");
@@ -3201,7 +3201,7 @@ static void Handle_DelBeacon(struct host_if_drv *drvHandler) 
	/* TODO: build del beacon message*/



	/*Sending Cfg*/

	s32Error = send_config_pkt(SET_CFG, &strWID, 1, false,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error)

		PRINT_ER("Failed to send delete beacon config packet\n");
@@ -3293,7 +3293,7 @@ static void Handle_AddStation(struct host_if_drv *drvHandler, 
	pu8CurrByte += WILC_HostIf_PackStaParam(pu8CurrByte, pstrStationParam);



	/*Sending Cfg*/

	s32Error = send_config_pkt(SET_CFG, &strWID, 1, false,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error != 0)

		PRINT_ER("Failed to send add station config packet\n");
@@ -3347,7 +3347,7 @@ static void Handle_DelAllSta(struct host_if_drv *drvHandler, 
	}



	/*Sending Cfg*/

	s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error)

		PRINT_ER("Failed to send add station config packet\n");
@@ -3391,7 +3391,7 @@ static void Handle_DelStation(struct host_if_drv *drvHandler, 
	memcpy(pu8CurrByte, pstrDelStaParam->au8MacAddr, ETH_ALEN);



	/*Sending Cfg*/

	s32Error = send_config_pkt(SET_CFG, &strWID, 1, false,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error)

		PRINT_ER("Failed to send add station config packet\n");
@@ -3431,7 +3431,7 @@ static void Handle_EditStation(struct host_if_drv *drvHandler, 
	pu8CurrByte += WILC_HostIf_PackStaParam(pu8CurrByte, pstrStationParam);



	/*Sending Cfg*/

	s32Error = send_config_pkt(SET_CFG, &strWID, 1, false,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error)

		PRINT_ER("Failed to send edit station config packet\n");
@@ -3505,7 +3505,7 @@ static int Handle_RemainOnChan(struct host_if_drv *drvHandler, 
	strWID.ps8WidVal[1] = (s8)pstrHostIfRemainOnChan->u16Channel;



	/*Sending Cfg*/

	s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error != 0)

		PRINT_ER("Failed to set remain on channel\n");
@@ -3565,7 +3565,7 @@ static int Handle_RegisterFrame(struct host_if_drv *drvHandler, 




	/*Sending Cfg*/

	s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error) {

		PRINT_ER("Failed to frame register config packet\n");
@@ -3612,7 +3612,7 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *drvHandler, 
		strWID.ps8WidVal[1] = FALSE_FRMWR_CHANNEL;



		/*Sending Cfg*/

		s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

		s32Error = send_config_pkt(SET_CFG, &strWID, 1,

					   get_id_from_handler(pstrWFIDrv));

		if (s32Error != 0) {

			PRINT_ER("Failed to set remain on channel\n");
@@ -3693,7 +3693,7 @@ static void Handle_PowerManagement(struct host_if_drv *drvHandler, 
	PRINT_D(HOSTINF_DBG, "Handling Power Management\n");



	/*Sending Cfg*/

	s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error)

		PRINT_ER("Failed to send power management config packet\n");
@@ -3739,7 +3739,7 @@ static void Handle_SetMulticastFilter(struct host_if_drv *drvHandler, 
		memcpy(pu8CurrByte, gau8MulticastMacAddrList, ((strHostIfSetMulti->u32count) * ETH_ALEN));



	/*Sending Cfg*/

	s32Error = send_config_pkt(SET_CFG, &strWID, 1, false,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(drvHandler));

	if (s32Error)

		PRINT_ER("Failed to send setup multicast config packet\n");
@@ -3804,7 +3804,7 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler, 
	/* Group Buffer Timeout */

	*ptr++ = 0;



	s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error)

		PRINT_D(HOSTINF_DBG, "Couldn't open BA Session\n");
@@ -3829,7 +3829,7 @@ static s32 Handle_AddBASession(struct host_if_drv *drvHandler, 
	*ptr++ = ((strHostIfBASessionInfo->u16SessionTimeout >> 16) & 0xFF);

	/*Ack-Policy */

	*ptr++ = 3;

	s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));



	if (strWID.ps8WidVal != NULL)
@@ -3878,7 +3878,7 @@ static s32 Handle_DelAllRxBASessions(struct host_if_drv *drvHandler, 
	/* Delba Reason */

	*ptr++ = 32; /* Unspecific QOS reason */



	s32Error = send_config_pkt(SET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(SET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error)

		PRINT_D(HOSTINF_DBG, "Couldn't delete BA Session\n");
@@ -5129,7 +5129,7 @@ s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocRespInf 




	/* Sending Configuration packet */

	s32Error = send_config_pkt(GET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(GET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	if (s32Error) {

		*pu32RcvdAssocRespInfoLen = 0;
@@ -5393,7 +5393,7 @@ s32 host_int_test_get_int_wid(struct host_if_drv *hWFIDrv, u32 *pu32TestMemAddr) 
	strWID.ps8WidVal = (s8 *)pu32TestMemAddr;

	strWID.s32ValueSize = sizeof(u32);



	s32Error = send_config_pkt(GET_CFG, &strWID, 1, true,

	s32Error = send_config_pkt(GET_CFG, &strWID, 1,

				   get_id_from_handler(pstrWFIDrv));

	/*get the value by searching the local copy*/

	if (s32Error) {