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

Commit 6c2ea946 authored by Alison Schofield's avatar Alison Schofield Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove code for HOST_IF_MSG_FLUSH_CONNECT 



The function that sent this message id was previously removed.
Finish the cleanup by removing the call to the message handler,
the message handler, and the #define.

Signed-off-by: default avatarAlison Schofield <amsfield22@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 895eb6a9

drivers/staging/wilc1000/host_interface.c

+0 −52
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#define HOST_IF_MSG_SET_OPERATION_MODE          27

#define HOST_IF_MSG_SET_IPADDRESS               28

#define HOST_IF_MSG_GET_IPADDRESS               29

#define HOST_IF_MSG_FLUSH_CONNECT               30

#define HOST_IF_MSG_GET_STATISTICS              31

#define HOST_IF_MSG_SET_MULTICAST_FILTER        32

#define HOST_IF_MSG_DEL_BA_SESSION              34
@@ -1187,53 +1186,6 @@ static s32 Handle_Connect(struct wilc_vif *vif, 
	return result;

}



static s32 Handle_FlushConnect(struct wilc_vif *vif)

{

	s32 result = 0;

	struct wid strWIDList[5];

	u32 u32WidsCount = 0;

	u8 *pu8CurrByte = NULL;



	strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_ASSOCIATE;

	strWIDList[u32WidsCount].type = WID_BIN_DATA;

	strWIDList[u32WidsCount].val = info_element;

	strWIDList[u32WidsCount].size = info_element_size;

	u32WidsCount++;



	strWIDList[u32WidsCount].id = (u16)WID_11I_MODE;

	strWIDList[u32WidsCount].type = WID_CHAR;

	strWIDList[u32WidsCount].size = sizeof(char);

	strWIDList[u32WidsCount].val = (s8 *)(&(mode_11i));

	u32WidsCount++;



	strWIDList[u32WidsCount].id = (u16)WID_AUTH_TYPE;

	strWIDList[u32WidsCount].type = WID_CHAR;

	strWIDList[u32WidsCount].size = sizeof(char);

	strWIDList[u32WidsCount].val = (s8 *)(&auth_type);

	u32WidsCount++;



	strWIDList[u32WidsCount].id = (u16)WID_JOIN_REQ_EXTENDED;

	strWIDList[u32WidsCount].type = WID_STR;

	strWIDList[u32WidsCount].size = join_req_size;

	strWIDList[u32WidsCount].val = (s8 *)join_req;

	pu8CurrByte = strWIDList[u32WidsCount].val;



	pu8CurrByte += FLUSHED_BYTE_POS;

	*(pu8CurrByte) = FLUSHED_JOIN_REQ;



	u32WidsCount++;



	result = wilc_send_config_pkt(vif, SET_CFG, strWIDList,

				      u32WidsCount,

				      wilc_get_vif_idx(join_req_vif));

	if (result) {

		netdev_err(vif->ndev, "failed to send config packet\n");

		result = -EINVAL;

	}



	return result;

}



static s32 Handle_ConnectTimeout(struct wilc_vif *vif)

{

	s32 result = 0;
@@ -2609,10 +2561,6 @@ static int hostIFthread(void *pvArg) 
			Handle_Connect(msg.vif, &msg.body.con_info);

			break;



		case HOST_IF_MSG_FLUSH_CONNECT:

			Handle_FlushConnect(msg.vif);

			break;



		case HOST_IF_MSG_RCVD_NTWRK_INFO:

			Handle_RcvdNtwrkInfo(msg.vif, &msg.body.net_info);

			break;