summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlison Schofield <amsfield22@gmail.com>2016-02-26 07:00:42 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-02 03:40:04 (GMT)
commit34b68e124774e2a7c01561849492961891bf1e3d (patch)
tree844dbc3f0593d725028f7baa90b4bd5c719af8b1
parent83ea341d9225d90a5ab9b6c07273d258f2b88fd2 (diff)
downloadlinux-34b68e124774e2a7c01561849492961891bf1e3d.tar.xz
staging: wilc1000: remove code for HOST_IF_MSG_GET_CHNL
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/wilc1000/host_interface.c27
1 files changed, 0 insertions, 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;