staging: wilc1000: remove code for HOST_IF_MSG_FLUSH_CONNECT
authorAlison Schofield <amsfield22@gmail.com>
Fri, 26 Feb 2016 07:02:17 +0000 (23:02 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Mar 2016 03:40:04 +0000 (19:40 -0800)
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: Alison Schofield <amsfield22@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/host_interface.c

index 633145329222e0228c43c2c7105d154d61187654..6efee28387aaaa21bb1cffe92188b0a61fb81362 100644 (file)
@@ -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 @@ ERRORHANDLER:
        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;