Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-20 18:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: wilc1000: remove unused code to set and get IP address

Browse Source 
Cleanup code to remove the variables related to setting and getting IP
address as this case was not handled from firmware side.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ajay Singh 2018-09-04 12:09:36 +05:30 committed by Greg Kroah-Hartman
parent f31e5584dc
commit abff8e3353
3 changed files with 0 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
drivers/staging/wilc1000/host_interface.c
View File

@ -191,11 +191,6 @@ static u8 p2p_listen_state;
static struct completion hif_driver_comp;
static struct mutex hif_deinit_lock;
static u8 set_ip[2][4];
static u8 get_ip[2][4];
static int host_int_get_ipaddress(struct wilc_vif *vif, u8 *ip_addr, u8 idx);
/* 'msg' should be free by the caller for syc */
static struct host_if_msg*
wilc_alloc_work(struct wilc_vif *vif, void (*work_fun)(struct work_struct *),
@ -348,64 +343,6 @@ static void handle_set_operation_mode(struct work_struct *work)
kfree(msg);
}
static void handle_set_ip_address(struct work_struct *work)
{
struct host_if_msg *msg = container_of(work, struct host_if_msg, work);
struct wilc_vif *vif = msg->vif;
u8 *ip_addr = msg->body.ip_info.ip_addr;
u8 idx = msg->body.ip_info.idx;
int ret;
struct wid wid;
char firmware_ip_addr[4] = {0};
if (ip_addr[0] < 192)
ip_addr[0] = 0;
memcpy(set_ip[idx], ip_addr, IP_ALEN);
wid.id = WID_IP_ADDRESS;
wid.type = WID_STR;
wid.val = ip_addr;
wid.size = IP_ALEN;
ret = wilc_send_config_pkt(vif, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif));
host_int_get_ipaddress(vif, firmware_ip_addr, idx);
if (ret)
netdev_err(vif->ndev, "Failed to set IP address\n");
kfree(msg);
}
static void handle_get_ip_address(struct work_struct *work)
{
struct host_if_msg *msg = container_of(work, struct host_if_msg, work);
struct wilc_vif *vif = msg->vif;
u8 idx = msg->body.ip_info.idx;
int ret;
struct wid wid;
wid.id = WID_IP_ADDRESS;
wid.type = WID_STR;
wid.val = kmalloc(IP_ALEN, GFP_KERNEL);
wid.size = IP_ALEN;
ret = wilc_send_config_pkt(vif, GET_CFG, &wid, 1,
wilc_get_vif_idx(vif));
memcpy(get_ip[idx], wid.val, IP_ALEN);
kfree(wid.val);
if (memcmp(get_ip[idx], set_ip[idx], IP_ALEN) != 0)
wilc_setup_ipaddress(vif, set_ip[idx], idx);
if (ret)
netdev_err(vif->ndev, "Failed to get IP address\n");
kfree(msg);
}
static void handle_get_mac_address(struct work_struct *work)
{
struct host_if_msg *msg = container_of(work, struct host_if_msg, work);
@ -4008,48 +3945,6 @@ int wilc_setup_multicast_filter(struct wilc_vif *vif, bool enabled, u32 count,
return result;
}
int wilc_setup_ipaddress(struct wilc_vif *vif, u8 *ip_addr, u8 idx)
{
int result;
struct host_if_msg *msg;
msg = wilc_alloc_work(vif, handle_set_ip_address, false);
if (IS_ERR(msg))
return PTR_ERR(msg);
msg->body.ip_info.ip_addr = ip_addr;
msg->body.ip_info.idx = idx;
result = wilc_enqueue_work(msg);
if (result) {
netdev_err(vif->ndev, "%s: enqueue work failed\n", __func__);
kfree(msg);
}
return result;
}
static int host_int_get_ipaddress(struct wilc_vif *vif, u8 *ip_addr, u8 idx)
{
int result;
struct host_if_msg *msg;
msg = wilc_alloc_work(vif, handle_get_ip_address, false);
if (IS_ERR(msg))
return PTR_ERR(msg);
msg->body.ip_info.ip_addr = ip_addr;
msg->body.ip_info.idx = idx;
result = wilc_enqueue_work(msg);
if (result) {
netdev_err(vif->ndev, "%s: enqueue work failed\n", __func__);
kfree(msg);
}
return result;
}
int wilc_set_tx_power(struct wilc_vif *vif, u8 tx_power)
{
int ret;

3
drivers/staging/wilc1000/host_interface.h
View File

@ -9,8 +9,6 @@
#include <linux/ieee80211.h>
#include "coreconfigurator.h"
#define IP_ALEN 4
#define IDLE_MODE 0x00
#define AP_MODE 0x01
#define STATION_MODE 0x02
@ -344,7 +342,6 @@ int wilc_edit_station(struct wilc_vif *vif,
int wilc_set_power_mgmt(struct wilc_vif *vif, bool enabled, u32 timeout);
int wilc_setup_multicast_filter(struct wilc_vif *vif, bool enabled, u32 count,
u8 *mc_list);
int wilc_setup_ipaddress(struct wilc_vif *vif, u8 *ip_addr, u8 idx);
int wilc_remain_on_channel(struct wilc_vif *vif, u32 session_id,
u32 duration, u16 chan,
wilc_remain_on_chan_expired expired,

3
drivers/staging/wilc1000/linux_wlan.c
View File

@ -61,7 +61,6 @@ static int dev_state_ev_handler(struct notifier_block *this,
netdev_dbg(dev, "IP add=%d:%d:%d:%d\n",
ip_addr_buf[0], ip_addr_buf[1],
ip_addr_buf[2], ip_addr_buf[3]);
wilc_setup_ipaddress(vif, ip_addr_buf, vif->idx);
break;
@ -83,8 +82,6 @@ static int dev_state_ev_handler(struct notifier_block *this,
ip_addr_buf[0], ip_addr_buf[1],
ip_addr_buf[2], ip_addr_buf[3]);
wilc_setup_ipaddress(vif, ip_addr_buf, vif->idx);
break;
default: