From ac4cf190fc95ea0815c76c9e3fc5c5b5e80114ff Mon Sep 17 00:00:00 2001 From: Alison Schofield Date: Thu, 25 Feb 2016 23:03:42 -0800 Subject: [PATCH] staging: wilc1000: remove code for HOST_IF_MSG_SET_MAC_ADDRESS 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 Signed-off-by: Greg Kroah-Hartman --- 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.7.4