* [PATCH 0/6] staging: wilc1000: remove code for unused HOST_IF_MSG's
@ 2016-02-26 5:49 Alison Schofield
2016-02-26 5:53 ` [PATCH 1/6] staging: wilc1000: remove code for HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS Alison Schofield
` (6 more replies)
0 siblings, 7 replies; 14+ messages in thread
From: Alison Schofield @ 2016-02-26 5:49 UTC (permalink / raw)
To: outreachy-kernel
The functions that sent these messages were previously removed.
Finish the cleanup by removing the calls to the message handlers,
the message handlers, the #define's, and unused variables.
Alison Schofield (6):
staging: wilc1000: remove code for HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS
staging: wilc1000: remove code for HOST_IF_MSG_SET_MAC_ADDRESS
staging: wilc1000: remove code for HOST_IF_MSG_GET_CHNL
staging: wilc1000: remove code for HOST_IF_GET_LINKSPEED
staging: wilc1000: remove code for HOST_IF_MSG_FLUSH_CONNECT
staging: wilc1000: remove code for HOST_IF_MSG_Q_IDLE
drivers/staging/wilc1000/host_interface.c | 182 ------------------------------
1 file changed, 182 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/6] staging: wilc1000: remove code for HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS
2016-02-26 5:49 [PATCH 0/6] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
@ 2016-02-26 5:53 ` Alison Schofield
2016-02-26 5:54 ` [PATCH 2/6] staging: wilc1000: remove code for HOST_IF_MSG_SET_MAC_ADDRESS Alison Schofield
` (5 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Alison Schofield @ 2016-02-26 5:53 UTC (permalink / raw)
To: outreachy-kernel
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>
---
drivers/staging/wilc1000/host_interface.c | 36 -------------------------------
1 file changed, 36 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 0c09df4..d004817 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -46,7 +46,6 @@
#define HOST_IF_MSG_DEL_BA_SESSION 34
#define HOST_IF_MSG_Q_IDLE 35
#define HOST_IF_MSG_DEL_ALL_STA 36
-#define HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS 37
#define HOST_IF_MSG_SET_TX_POWER 38
#define HOST_IF_MSG_GET_TX_POWER 39
#define HOST_IF_MSG_EXIT 100
@@ -2583,37 +2582,6 @@ ERRORHANDLER:
kfree(wid.val);
}
-static s32 Handle_DelAllRxBASessions(struct wilc_vif *vif,
- struct ba_session_info *strHostIfBASessionInfo)
-{
- s32 result = 0;
- struct wid wid;
- char *ptr = NULL;
-
- wid.id = (u16)WID_DEL_ALL_RX_BA;
- wid.type = WID_STR;
- wid.val = kmalloc(BLOCK_ACK_REQ_SIZE, GFP_KERNEL);
- wid.size = BLOCK_ACK_REQ_SIZE;
- ptr = wid.val;
- *ptr++ = 0x14;
- *ptr++ = 0x3;
- *ptr++ = 0x2;
- memcpy(ptr, strHostIfBASessionInfo->bssid, ETH_ALEN);
- ptr += ETH_ALEN;
- *ptr++ = strHostIfBASessionInfo->tid;
- *ptr++ = 0;
- *ptr++ = 32;
-
- result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1,
- wilc_get_vif_idx(vif));
-
- kfree(wid.val);
-
- up(&hif_sema_wait_response);
-
- return result;
-}
-
static void handle_set_tx_pwr(struct wilc_vif *vif, u8 tx_pwr)
{
int ret;
@@ -2831,10 +2799,6 @@ static int hostIFthread(void *pvArg)
Handle_SetMulticastFilter(msg.vif, &msg.body.multicast_info);
break;
- case HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS:
- Handle_DelAllRxBASessions(msg.vif, &msg.body.session_info);
- break;
-
case HOST_IF_MSG_DEL_ALL_STA:
Handle_DelAllSta(msg.vif, &msg.body.del_all_sta_info);
break;
--
2.1.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/6] staging: wilc1000: remove code for HOST_IF_MSG_SET_MAC_ADDRESS
2016-02-26 5:49 [PATCH 0/6] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
2016-02-26 5:53 ` [PATCH 1/6] staging: wilc1000: remove code for HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS Alison Schofield
@ 2016-02-26 5:54 ` Alison Schofield
2016-02-26 6:32 ` [Outreachy kernel] " Greg KH
2016-02-26 5:55 ` [PATCH 3/6] staging: wilc1000: remove code for HOST_IF_MSG_GET_CHNL Alison Schofield
` (4 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Alison Schofield @ 2016-02-26 5:54 UTC (permalink / raw)
To: outreachy-kernel
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>
---
drivers/staging/wilc1000/host_interface.c | 29 -----------------------------
1 file changed, 29 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index d004817..4099982 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -35,7 +35,6 @@
#define HOST_IF_MSG_LISTEN_TIMER_FIRED 22
#define HOST_IF_MSG_GET_LINKSPEED 23
#define HOST_IF_MSG_SET_WFIDRV_HANDLER 24
-#define HOST_IF_MSG_SET_MAC_ADDRESS 25
#define HOST_IF_MSG_GET_MAC_ADDRESS 26
#define HOST_IF_MSG_SET_OPERATION_MODE 27
#define HOST_IF_MSG_SET_IPADDRESS 28
@@ -423,29 +422,6 @@ static s32 handle_get_ip_address(struct wilc_vif *vif, u8 idx)
return result;
}
-static void handle_set_mac_address(struct wilc_vif *vif,
- struct set_mac_addr *set_mac_addr)
-{
- int ret = 0;
- struct wid wid;
-
- u8 *mac_buf = kmemdup(set_mac_addr->mac_addr, ETH_ALEN, GFP_KERNEL);
- if (!mac_buf)
- return;
-
- wid.id = (u16)WID_MAC_ADDR;
- wid.type = WID_STR;
- wid.val = mac_buf;
- wid.size = ETH_ALEN;
-
- ret = wilc_send_config_pkt(vif, SET_CFG, &wid, 1,
- wilc_get_vif_idx(vif));
- if (ret)
- netdev_err(vif->ndev, "Failed to set mac address\n");
-
- kfree(mac_buf);
-}
-
static s32 handle_get_mac_address(struct wilc_vif *vif,
struct get_mac_addr *get_mac_addr)
{
@@ -2773,11 +2749,6 @@ static int hostIFthread(void *pvArg)
handle_get_ip_address(vif, msg.body.ip_info.idx);
break;
- case HOST_IF_MSG_SET_MAC_ADDRESS:
- handle_set_mac_address(msg.vif,
- &msg.body.set_mac_info);
- break;
-
case HOST_IF_MSG_GET_MAC_ADDRESS:
handle_get_mac_address(msg.vif,
&msg.body.get_mac_info);
--
2.1.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/6] staging: wilc1000: remove code for HOST_IF_MSG_GET_CHNL
2016-02-26 5:49 [PATCH 0/6] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
2016-02-26 5:53 ` [PATCH 1/6] staging: wilc1000: remove code for HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS Alison Schofield
2016-02-26 5:54 ` [PATCH 2/6] staging: wilc1000: remove code for HOST_IF_MSG_SET_MAC_ADDRESS Alison Schofield
@ 2016-02-26 5:55 ` Alison Schofield
2016-02-26 5:55 ` [PATCH 4/6] staging: wilc1000: remove code for HOST_IF_GET_LINKSPEED Alison Schofield
` (3 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Alison Schofield @ 2016-02-26 5:55 UTC (permalink / raw)
To: outreachy-kernel
The function that sent this message id was previously removed.
Finish the cleanup by removing the call to the message handler,
the message handler, the #define, and the channel var.
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 4099982..bdb3c7e 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -20,7 +20,6 @@
#define HOST_IF_MSG_SET_CHANNEL 7
#define HOST_IF_MSG_DISCONNECT 8
#define HOST_IF_MSG_GET_RSSI 9
-#define HOST_IF_MSG_GET_CHNL 10
#define HOST_IF_MSG_ADD_BEACON 11
#define HOST_IF_MSG_DEL_BEACON 12
#define HOST_IF_MSG_ADD_STATION 13
@@ -252,7 +251,6 @@ static bool scan_while_connected;
static s8 rssi;
static s8 link_speed;
-static u8 ch_no;
static u8 set_ip[2][4];
static u8 get_ip[2][4];
static u32 inactive_time;
@@ -1930,27 +1928,6 @@ void wilc_resolve_disconnect_aberration(struct wilc_vif *vif)
wilc_disconnect(vif, 1);
}
-static s32 Handle_GetChnl(struct wilc_vif *vif)
-{
- s32 result = 0;
- struct wid wid;
-
- wid.id = (u16)WID_CURRENT_CHANNEL;
- wid.type = WID_CHAR;
- wid.val = (s8 *)&ch_no;
- wid.size = sizeof(char);
-
- result = wilc_send_config_pkt(vif, GET_CFG, &wid, 1,
- wilc_get_vif_idx(vif));
-
- if (result) {
- netdev_err(vif->ndev, "Failed to get channel number\n");
- result = -EFAULT;
- }
-
- return result;
-}
-
static void Handle_GetRssi(struct wilc_vif *vif)
{
s32 result = 0;
@@ -2689,10 +2666,6 @@ static int hostIFthread(void *pvArg)
(struct rf_info *)msg.body.data);
break;
- case HOST_IF_MSG_GET_CHNL:
- Handle_GetChnl(msg.vif);
- break;
-
case HOST_IF_MSG_ADD_BEACON:
Handle_AddBeacon(msg.vif, &msg.body.beacon_info);
break;
--
2.1.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 4/6] staging: wilc1000: remove code for HOST_IF_GET_LINKSPEED
2016-02-26 5:49 [PATCH 0/6] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
` (2 preceding siblings ...)
2016-02-26 5:55 ` [PATCH 3/6] staging: wilc1000: remove code for HOST_IF_MSG_GET_CHNL Alison Schofield
@ 2016-02-26 5:55 ` Alison Schofield
2016-02-26 5:56 ` [PATCH 5/6] staging: wilc1000: remove code for HOST_IF_MSG_FLUSH_CONNECT Alison Schofield
` (2 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Alison Schofield @ 2016-02-26 5:55 UTC (permalink / raw)
To: outreachy-kernel
The function that sent this message id was previously removed.
Finish the cleanup by removing the call to the message handler,
the message handler, the #define, and the link_speed var.
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index bdb3c7e..a772fde 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -32,7 +32,6 @@
#define HOST_IF_MSG_REMAIN_ON_CHAN 20
#define HOST_IF_MSG_REGISTER_FRAME 21
#define HOST_IF_MSG_LISTEN_TIMER_FIRED 22
-#define HOST_IF_MSG_GET_LINKSPEED 23
#define HOST_IF_MSG_SET_WFIDRV_HANDLER 24
#define HOST_IF_MSG_GET_MAC_ADDRESS 26
#define HOST_IF_MSG_SET_OPERATION_MODE 27
@@ -250,7 +249,6 @@ static u8 rcv_assoc_resp[MAX_ASSOC_RESP_FRAME_SIZE];
static bool scan_while_connected;
static s8 rssi;
-static s8 link_speed;
static u8 set_ip[2][4];
static u8 get_ip[2][4];
static u32 inactive_time;
@@ -1948,27 +1946,6 @@ static void Handle_GetRssi(struct wilc_vif *vif)
up(&vif->hif_drv->sem_get_rssi);
}
-static void Handle_GetLinkspeed(struct wilc_vif *vif)
-{
- s32 result = 0;
- struct wid wid;
-
- link_speed = 0;
-
- wid.id = (u16)WID_LINKSPEED;
- wid.type = WID_CHAR;
- wid.val = &link_speed;
- wid.size = sizeof(char);
-
- result = wilc_send_config_pkt(vif, GET_CFG, &wid, 1,
- wilc_get_vif_idx(vif));
- if (result) {
- netdev_err(vif->ndev, "Failed to get LINKSPEED value\n");
- result = -EFAULT;
- }
-
-}
-
static s32 Handle_GetStatistics(struct wilc_vif *vif,
struct rf_info *pstrStatistics)
{
@@ -2657,10 +2634,6 @@ static int hostIFthread(void *pvArg)
Handle_GetRssi(msg.vif);
break;
- case HOST_IF_MSG_GET_LINKSPEED:
- Handle_GetLinkspeed(msg.vif);
- break;
-
case HOST_IF_MSG_GET_STATISTICS:
Handle_GetStatistics(msg.vif,
(struct rf_info *)msg.body.data);
--
2.1.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 5/6] staging: wilc1000: remove code for HOST_IF_MSG_FLUSH_CONNECT
2016-02-26 5:49 [PATCH 0/6] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
` (3 preceding siblings ...)
2016-02-26 5:55 ` [PATCH 4/6] staging: wilc1000: remove code for HOST_IF_GET_LINKSPEED Alison Schofield
@ 2016-02-26 5:56 ` Alison Schofield
2016-02-26 5:58 ` [PATCH 6/6] staging: wilc1000: remove code for HOST_IF_MSG_Q_IDLE Alison Schofield
2016-02-26 6:59 ` [PATCH v2 0/5] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
6 siblings, 0 replies; 14+ messages in thread
From: Alison Schofield @ 2016-02-26 5:56 UTC (permalink / raw)
To: outreachy-kernel
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>
---
drivers/staging/wilc1000/host_interface.c | 52 -------------------------------
1 file changed, 52 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index a772fde..6c0e7e1 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -37,7 +37,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
@@ -1165,53 +1164,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;
@@ -2587,10 +2539,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;
--
2.1.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 6/6] staging: wilc1000: remove code for HOST_IF_MSG_Q_IDLE
2016-02-26 5:49 [PATCH 0/6] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
` (4 preceding siblings ...)
2016-02-26 5:56 ` [PATCH 5/6] staging: wilc1000: remove code for HOST_IF_MSG_FLUSH_CONNECT Alison Schofield
@ 2016-02-26 5:58 ` Alison Schofield
2016-02-26 6:59 ` [PATCH v2 0/5] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
6 siblings, 0 replies; 14+ messages in thread
From: Alison Schofield @ 2016-02-26 5:58 UTC (permalink / raw)
To: outreachy-kernel
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>
---
drivers/staging/wilc1000/host_interface.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 6c0e7e1..212e436 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -40,7 +40,6 @@
#define HOST_IF_MSG_GET_STATISTICS 31
#define HOST_IF_MSG_SET_MULTICAST_FILTER 32
#define HOST_IF_MSG_DEL_BA_SESSION 34
-#define HOST_IF_MSG_Q_IDLE 35
#define HOST_IF_MSG_DEL_ALL_STA 36
#define HOST_IF_MSG_SET_TX_POWER 38
#define HOST_IF_MSG_GET_TX_POWER 39
@@ -733,12 +732,6 @@ ERRORHANDLER:
return result;
}
-static void Handle_wait_msg_q_empty(void)
-{
- wilc_initialized = 0;
- up(&hif_sema_wait_response);
-}
-
static s32 Handle_ScanDone(struct wilc_vif *vif,
enum scan_event enuEvent);
@@ -2527,10 +2520,6 @@ static int hostIFthread(void *pvArg)
}
switch (msg.id) {
- case HOST_IF_MSG_Q_IDLE:
- Handle_wait_msg_q_empty();
- break;
-
case HOST_IF_MSG_SCAN:
Handle_Scan(msg.vif, &msg.body.scan_info);
break;
--
2.1.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [Outreachy kernel] [PATCH 2/6] staging: wilc1000: remove code for HOST_IF_MSG_SET_MAC_ADDRESS
2016-02-26 5:54 ` [PATCH 2/6] staging: wilc1000: remove code for HOST_IF_MSG_SET_MAC_ADDRESS Alison Schofield
@ 2016-02-26 6:32 ` Greg KH
0 siblings, 0 replies; 14+ messages in thread
From: Greg KH @ 2016-02-26 6:32 UTC (permalink / raw)
To: Alison Schofield; +Cc: outreachy-kernel
On Thu, Feb 25, 2016 at 09:54:19PM -0800, Alison Schofield wrote:
> 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>
> ---
> drivers/staging/wilc1000/host_interface.c | 29 -----------------------------
> 1 file changed, 29 deletions(-)
Due to other changes in this file, this patch didn't apply, but I
applied your first patch in this series. Can you rebase the rest of
these patches against my staging-testing branch and resend them?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 0/5] staging: wilc1000: remove code for unused HOST_IF_MSG's
2016-02-26 5:49 [PATCH 0/6] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
` (5 preceding siblings ...)
2016-02-26 5:58 ` [PATCH 6/6] staging: wilc1000: remove code for HOST_IF_MSG_Q_IDLE Alison Schofield
@ 2016-02-26 6:59 ` Alison Schofield
2016-02-26 7:00 ` [PATCH v2 1/5] staging: wilc1000: remove code for HOST_IF_MSG_GET_CHNL Alison Schofield
` (4 more replies)
6 siblings, 5 replies; 14+ messages in thread
From: Alison Schofield @ 2016-02-26 6:59 UTC (permalink / raw)
To: outreachy-kernel
The functions that sent these messages were previously removed.
Finish the cleanup by removing the calls to the message handlers,
the message handlers, the #define's, and unused variables.
Changes in v2:
5 Patches Rebased and Resending. (one made it through the first time)
Alison Schofield (5):
staging: wilc1000: remove code for HOST_IF_MSG_GET_CHNL
staging: wilc1000: remove code for HOST_IF_GET_LINKSPEED
staging: wilc1000: remove code for HOST_IF_MSG_FLUSH_CONNECT
staging: wilc1000: remove code for HOST_IF_MSG_Q_IDLE
staging: wilc1000: remove code for HOST_IF_MSG_SET_MAC_ADDRESS
drivers/staging/wilc1000/host_interface.c | 147 ------------------------------
1 file changed, 147 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 1/5] staging: wilc1000: remove code for HOST_IF_MSG_GET_CHNL
2016-02-26 6:59 ` [PATCH v2 0/5] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
@ 2016-02-26 7:00 ` Alison Schofield
2016-02-26 7:01 ` [PATCH v2 2/5] staging: wilc1000: remove code for HOST_IF_GET_LINKSPEED Alison Schofield
` (3 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Alison Schofield @ 2016-02-26 7:00 UTC (permalink / raw)
To: outreachy-kernel
The function that sent this message id was previously removed.
Finish the cleanup by removing the call to the message handler,
the message handler, the #define, and the channel var.
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index b2fdc93..546161f 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -20,7 +20,6 @@
#define HOST_IF_MSG_SET_CHANNEL 7
#define HOST_IF_MSG_DISCONNECT 8
#define HOST_IF_MSG_GET_RSSI 9
-#define HOST_IF_MSG_GET_CHNL 10
#define HOST_IF_MSG_ADD_BEACON 11
#define HOST_IF_MSG_DEL_BEACON 12
#define HOST_IF_MSG_ADD_STATION 13
@@ -249,7 +248,6 @@ static bool scan_while_connected;
static s8 rssi;
static s8 link_speed;
-static u8 ch_no;
static u8 set_ip[2][4];
static u8 get_ip[2][4];
static u32 inactive_time;
@@ -1952,27 +1950,6 @@ void wilc_resolve_disconnect_aberration(struct wilc_vif *vif)
wilc_disconnect(vif, 1);
}
-static s32 Handle_GetChnl(struct wilc_vif *vif)
-{
- s32 result = 0;
- struct wid wid;
-
- wid.id = (u16)WID_CURRENT_CHANNEL;
- wid.type = WID_CHAR;
- wid.val = (s8 *)&ch_no;
- wid.size = sizeof(char);
-
- result = wilc_send_config_pkt(vif, GET_CFG, &wid, 1,
- wilc_get_vif_idx(vif));
-
- if (result) {
- netdev_err(vif->ndev, "Failed to get channel number\n");
- result = -EFAULT;
- }
-
- return result;
-}
-
static void Handle_GetRssi(struct wilc_vif *vif)
{
s32 result = 0;
@@ -2711,10 +2688,6 @@ static int hostIFthread(void *pvArg)
(struct rf_info *)msg.body.data);
break;
- case HOST_IF_MSG_GET_CHNL:
- Handle_GetChnl(msg.vif);
- break;
-
case HOST_IF_MSG_ADD_BEACON:
Handle_AddBeacon(msg.vif, &msg.body.beacon_info);
break;
--
2.1.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 2/5] staging: wilc1000: remove code for HOST_IF_GET_LINKSPEED
2016-02-26 6:59 ` [PATCH v2 0/5] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
2016-02-26 7:00 ` [PATCH v2 1/5] staging: wilc1000: remove code for HOST_IF_MSG_GET_CHNL Alison Schofield
@ 2016-02-26 7:01 ` Alison Schofield
2016-02-26 7:02 ` [PATCH v2 3/5] staging: wilc1000: remove code for HOST_IF_MSG_FLUSH_CONNECT Alison Schofield
` (2 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Alison Schofield @ 2016-02-26 7:01 UTC (permalink / raw)
To: outreachy-kernel
The function that sent this message id was previously removed.
Finish the cleanup by removing the call to the message handler,
the message handler, the #define, and the link_speed var.
Signed-off-by: Alison Schofield <amsfield22@gmail.com>
---
drivers/staging/wilc1000/host_interface.c | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 546161f..6331453 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -32,7 +32,6 @@
#define HOST_IF_MSG_REMAIN_ON_CHAN 20
#define HOST_IF_MSG_REGISTER_FRAME 21
#define HOST_IF_MSG_LISTEN_TIMER_FIRED 22
-#define HOST_IF_MSG_GET_LINKSPEED 23
#define HOST_IF_MSG_SET_WFIDRV_HANDLER 24
#define HOST_IF_MSG_SET_MAC_ADDRESS 25
#define HOST_IF_MSG_GET_MAC_ADDRESS 26
@@ -247,7 +246,6 @@ static u8 rcv_assoc_resp[MAX_ASSOC_RESP_FRAME_SIZE];
static bool scan_while_connected;
static s8 rssi;
-static s8 link_speed;
static u8 set_ip[2][4];
static u8 get_ip[2][4];
static u32 inactive_time;
@@ -1970,27 +1968,6 @@ static void Handle_GetRssi(struct wilc_vif *vif)
up(&vif->hif_drv->sem_get_rssi);
}
-static void Handle_GetLinkspeed(struct wilc_vif *vif)
-{
- s32 result = 0;
- struct wid wid;
-
- link_speed = 0;
-
- wid.id = (u16)WID_LINKSPEED;
- wid.type = WID_CHAR;
- wid.val = &link_speed;
- wid.size = sizeof(char);
-
- result = wilc_send_config_pkt(vif, GET_CFG, &wid, 1,
- wilc_get_vif_idx(vif));
- if (result) {
- netdev_err(vif->ndev, "Failed to get LINKSPEED value\n");
- result = -EFAULT;
- }
-
-}
-
static s32 Handle_GetStatistics(struct wilc_vif *vif,
struct rf_info *pstrStatistics)
{
@@ -2679,10 +2656,6 @@ static int hostIFthread(void *pvArg)
Handle_GetRssi(msg.vif);
break;
- case HOST_IF_MSG_GET_LINKSPEED:
- Handle_GetLinkspeed(msg.vif);
- break;
-
case HOST_IF_MSG_GET_STATISTICS:
Handle_GetStatistics(msg.vif,
(struct rf_info *)msg.body.data);
--
2.1.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 3/5] staging: wilc1000: remove code for HOST_IF_MSG_FLUSH_CONNECT
2016-02-26 6:59 ` [PATCH v2 0/5] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
2016-02-26 7:00 ` [PATCH v2 1/5] staging: wilc1000: remove code for HOST_IF_MSG_GET_CHNL Alison Schofield
2016-02-26 7:01 ` [PATCH v2 2/5] staging: wilc1000: remove code for HOST_IF_GET_LINKSPEED Alison Schofield
@ 2016-02-26 7:02 ` Alison Schofield
2016-02-26 7:02 ` [PATCH v2 4/5] staging: wilc1000: remove code for HOST_IF_MSG_Q_IDLE Alison Schofield
2016-02-26 7:03 ` [PATCH v2 5/5] staging: wilc1000: remove code for HOST_IF_MSG_SET_MAC_ADDRESS Alison Schofield
4 siblings, 0 replies; 14+ messages in thread
From: Alison Schofield @ 2016-02-26 7:02 UTC (permalink / raw)
To: outreachy-kernel
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>
---
drivers/staging/wilc1000/host_interface.c | 52 -------------------------------
1 file changed, 52 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 6331453..6efee28 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -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;
--
2.1.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 4/5] staging: wilc1000: remove code for HOST_IF_MSG_Q_IDLE
2016-02-26 6:59 ` [PATCH v2 0/5] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
` (2 preceding siblings ...)
2016-02-26 7:02 ` [PATCH v2 3/5] staging: wilc1000: remove code for HOST_IF_MSG_FLUSH_CONNECT Alison Schofield
@ 2016-02-26 7:02 ` Alison Schofield
2016-02-26 7:03 ` [PATCH v2 5/5] staging: wilc1000: remove code for HOST_IF_MSG_SET_MAC_ADDRESS Alison Schofield
4 siblings, 0 replies; 14+ messages in thread
From: Alison Schofield @ 2016-02-26 7:02 UTC (permalink / raw)
To: outreachy-kernel
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>
---
drivers/staging/wilc1000/host_interface.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 6efee28..741a6c7 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -41,7 +41,6 @@
#define HOST_IF_MSG_GET_STATISTICS 31
#define HOST_IF_MSG_SET_MULTICAST_FILTER 32
#define HOST_IF_MSG_DEL_BA_SESSION 34
-#define HOST_IF_MSG_Q_IDLE 35
#define HOST_IF_MSG_DEL_ALL_STA 36
#define HOST_IF_MSG_SET_TX_POWER 38
#define HOST_IF_MSG_GET_TX_POWER 39
@@ -755,12 +754,6 @@ ERRORHANDLER:
return result;
}
-static void Handle_wait_msg_q_empty(void)
-{
- wilc_initialized = 0;
- up(&hif_sema_wait_response);
-}
-
static s32 Handle_ScanDone(struct wilc_vif *vif,
enum scan_event enuEvent);
@@ -2549,10 +2542,6 @@ static int hostIFthread(void *pvArg)
}
switch (msg.id) {
- case HOST_IF_MSG_Q_IDLE:
- Handle_wait_msg_q_empty();
- break;
-
case HOST_IF_MSG_SCAN:
Handle_Scan(msg.vif, &msg.body.scan_info);
break;
--
2.1.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 5/5] staging: wilc1000: remove code for HOST_IF_MSG_SET_MAC_ADDRESS
2016-02-26 6:59 ` [PATCH v2 0/5] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
` (3 preceding siblings ...)
2016-02-26 7:02 ` [PATCH v2 4/5] staging: wilc1000: remove code for HOST_IF_MSG_Q_IDLE Alison Schofield
@ 2016-02-26 7:03 ` Alison Schofield
4 siblings, 0 replies; 14+ messages in thread
From: Alison Schofield @ 2016-02-26 7:03 UTC (permalink / raw)
To: outreachy-kernel
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>
---
drivers/staging/wilc1000/host_interface.c | 30 ------------------------------
1 file changed, 30 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 741a6c7..854b674 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -33,7 +33,6 @@
#define HOST_IF_MSG_REGISTER_FRAME 21
#define HOST_IF_MSG_LISTEN_TIMER_FIRED 22
#define HOST_IF_MSG_SET_WFIDRV_HANDLER 24
-#define HOST_IF_MSG_SET_MAC_ADDRESS 25
#define HOST_IF_MSG_GET_MAC_ADDRESS 26
#define HOST_IF_MSG_SET_OPERATION_MODE 27
#define HOST_IF_MSG_SET_IPADDRESS 28
@@ -413,30 +412,6 @@ static s32 handle_get_ip_address(struct wilc_vif *vif, u8 idx)
return result;
}
-static void handle_set_mac_address(struct wilc_vif *vif,
- struct set_mac_addr *set_mac_addr)
-{
- int ret = 0;
- struct wid wid;
- u8 *mac_buf;
-
- mac_buf = kmemdup(set_mac_addr->mac_addr, ETH_ALEN, GFP_KERNEL);
- if (!mac_buf)
- return;
-
- wid.id = (u16)WID_MAC_ADDR;
- wid.type = WID_STR;
- wid.val = mac_buf;
- wid.size = ETH_ALEN;
-
- ret = wilc_send_config_pkt(vif, SET_CFG, &wid, 1,
- wilc_get_vif_idx(vif));
- if (ret)
- netdev_err(vif->ndev, "Failed to set mac address\n");
-
- kfree(mac_buf);
-}
-
static s32 handle_get_mac_address(struct wilc_vif *vif,
struct get_mac_addr *get_mac_addr)
{
@@ -2654,11 +2629,6 @@ static int hostIFthread(void *pvArg)
handle_get_ip_address(vif, msg.body.ip_info.idx);
break;
- case HOST_IF_MSG_SET_MAC_ADDRESS:
- handle_set_mac_address(msg.vif,
- &msg.body.set_mac_info);
- break;
-
case HOST_IF_MSG_GET_MAC_ADDRESS:
handle_get_mac_address(msg.vif,
&msg.body.get_mac_info);
--
2.1.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2016-02-26 7:03 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-26 5:49 [PATCH 0/6] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
2016-02-26 5:53 ` [PATCH 1/6] staging: wilc1000: remove code for HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS Alison Schofield
2016-02-26 5:54 ` [PATCH 2/6] staging: wilc1000: remove code for HOST_IF_MSG_SET_MAC_ADDRESS Alison Schofield
2016-02-26 6:32 ` [Outreachy kernel] " Greg KH
2016-02-26 5:55 ` [PATCH 3/6] staging: wilc1000: remove code for HOST_IF_MSG_GET_CHNL Alison Schofield
2016-02-26 5:55 ` [PATCH 4/6] staging: wilc1000: remove code for HOST_IF_GET_LINKSPEED Alison Schofield
2016-02-26 5:56 ` [PATCH 5/6] staging: wilc1000: remove code for HOST_IF_MSG_FLUSH_CONNECT Alison Schofield
2016-02-26 5:58 ` [PATCH 6/6] staging: wilc1000: remove code for HOST_IF_MSG_Q_IDLE Alison Schofield
2016-02-26 6:59 ` [PATCH v2 0/5] staging: wilc1000: remove code for unused HOST_IF_MSG's Alison Schofield
2016-02-26 7:00 ` [PATCH v2 1/5] staging: wilc1000: remove code for HOST_IF_MSG_GET_CHNL Alison Schofield
2016-02-26 7:01 ` [PATCH v2 2/5] staging: wilc1000: remove code for HOST_IF_GET_LINKSPEED Alison Schofield
2016-02-26 7:02 ` [PATCH v2 3/5] staging: wilc1000: remove code for HOST_IF_MSG_FLUSH_CONNECT Alison Schofield
2016-02-26 7:02 ` [PATCH v2 4/5] staging: wilc1000: remove code for HOST_IF_MSG_Q_IDLE Alison Schofield
2016-02-26 7:03 ` [PATCH v2 5/5] staging: wilc1000: remove code for HOST_IF_MSG_SET_MAC_ADDRESS Alison Schofield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.