Skip to content

L
linux
Commit cd2920a5 authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files
Options

staging: wilc1000: remove wilc of struct host_if_drv 

vif has wilc in it's members so no need to have wilc in host_if_drv.
It is redundant so just remove it and use wilc of vif.
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b13584a8
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 60 deletions
drivers/staging/wilc1000/host_interface.c
View file @ cd2920a5
...@@ -293,7 +293,6 @@ static s32 handle_set_channel(struct wilc_vif *vif, ...@@ -293,7 +293,6 @@ static s32 handle_set_channel(struct wilc_vif *vif,
{ {
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
struct host_if_drv *hif_drv = vif->hif_drv;
wid.id = (u16)WID_CURRENT_CHANNEL; wid.id = (u16)WID_CURRENT_CHANNEL;
wid.type = WID_CHAR; wid.type = WID_CHAR;
...@@ -302,7 +301,7 @@ static s32 handle_set_channel(struct wilc_vif *vif, ...@@ -302,7 +301,7 @@ static s32 handle_set_channel(struct wilc_vif *vif,
PRINT_D(HOSTINF_DBG, "Setting channel\n"); PRINT_D(HOSTINF_DBG, "Setting channel\n");
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) { if (result) {
...@@ -343,14 +342,13 @@ static s32 handle_set_operation_mode(struct wilc_vif *vif, ...@@ -343,14 +342,13 @@ static s32 handle_set_operation_mode(struct wilc_vif *vif,
{ {
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
struct host_if_drv *hif_drv = vif->hif_drv;
wid.id = (u16)WID_SET_OPERATION_MODE; wid.id = (u16)WID_SET_OPERATION_MODE;
wid.type = WID_INT; wid.type = WID_INT;
wid.val = (s8 *)&hif_op_mode->mode; wid.val = (s8 *)&hif_op_mode->mode;
wid.size = sizeof(u32); wid.size = sizeof(u32);
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if ((hif_op_mode->mode) == IDLE_MODE) if ((hif_op_mode->mode) == IDLE_MODE)
...@@ -388,7 +386,7 @@ static s32 handle_set_ip_address(struct wilc_vif *vif, u8 *ip_addr, u8 idx) ...@@ -388,7 +386,7 @@ static s32 handle_set_ip_address(struct wilc_vif *vif, u8 *ip_addr, u8 idx)
wid.val = (u8 *)ip_addr; wid.val = (u8 *)ip_addr;
wid.size = IP_ALEN; wid.size = IP_ALEN;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
host_int_get_ipaddress(vif, hif_drv, firmware_ip_addr, idx); host_int_get_ipaddress(vif, hif_drv, firmware_ip_addr, idx);
...@@ -407,14 +405,13 @@ static s32 handle_get_ip_address(struct wilc_vif *vif, u8 idx) ...@@ -407,14 +405,13 @@ static s32 handle_get_ip_address(struct wilc_vif *vif, u8 idx)
{ {
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
struct host_if_drv *hif_drv = vif->hif_drv;
wid.id = (u16)WID_IP_ADDRESS; wid.id = (u16)WID_IP_ADDRESS;
wid.type = WID_STR; wid.type = WID_STR;
wid.val = kmalloc(IP_ALEN, GFP_KERNEL); wid.val = kmalloc(IP_ALEN, GFP_KERNEL);
wid.size = IP_ALEN; wid.size = IP_ALEN;
result = wilc_send_config_pkt(hif_drv->wilc, GET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, GET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
PRINT_INFO(HOSTINF_DBG, "%pI4\n", wid.val); PRINT_INFO(HOSTINF_DBG, "%pI4\n", wid.val);
...@@ -443,7 +440,6 @@ static s32 handle_set_mac_address(struct wilc_vif *vif, ...@@ -443,7 +440,6 @@ static s32 handle_set_mac_address(struct wilc_vif *vif,
{ {
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
struct host_if_drv *hif_drv = vif->hif_drv;
u8 *mac_buf = kmalloc(ETH_ALEN, GFP_KERNEL); u8 *mac_buf = kmalloc(ETH_ALEN, GFP_KERNEL);
if (!mac_buf) { if (!mac_buf) {
...@@ -458,7 +454,7 @@ static s32 handle_set_mac_address(struct wilc_vif *vif, ...@@ -458,7 +454,7 @@ static s32 handle_set_mac_address(struct wilc_vif *vif,
wid.size = ETH_ALEN; wid.size = ETH_ALEN;
PRINT_D(GENERIC_DBG, "mac addr = :%pM\n", wid.val); PRINT_D(GENERIC_DBG, "mac addr = :%pM\n", wid.val);
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) { if (result) {
PRINT_ER("Failed to set mac address\n"); PRINT_ER("Failed to set mac address\n");
...@@ -474,14 +470,13 @@ static s32 handle_get_mac_address(struct wilc_vif *vif, ...@@ -474,14 +470,13 @@ static s32 handle_get_mac_address(struct wilc_vif *vif,
{ {
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
struct host_if_drv *hif_drv = vif->hif_drv;
wid.id = (u16)WID_MAC_ADDR; wid.id = (u16)WID_MAC_ADDR;
wid.type = WID_STR; wid.type = WID_STR;
wid.val = get_mac_addr->mac_addr; wid.val = get_mac_addr->mac_addr;
wid.size = ETH_ALEN; wid.size = ETH_ALEN;
result = wilc_send_config_pkt(hif_drv->wilc, GET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, GET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) { if (result) {
...@@ -777,7 +772,7 @@ static s32 handle_cfg_param(struct wilc_vif *vif, ...@@ -777,7 +772,7 @@ static s32 handle_cfg_param(struct wilc_vif *vif,
wid_cnt++; wid_cnt++;
} }
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, wid_list, result = wilc_send_config_pkt(vif->wilc, SET_CFG, wid_list,
wid_cnt, wilc_get_vif_idx(vif)); wid_cnt, wilc_get_vif_idx(vif));
if (result) if (result)
...@@ -901,7 +896,7 @@ static s32 Handle_Scan(struct wilc_vif *vif, ...@@ -901,7 +896,7 @@ static s32 Handle_Scan(struct wilc_vif *vif,
else if (hif_drv->hif_state == HOST_IF_IDLE) else if (hif_drv->hif_state == HOST_IF_IDLE)
scan_while_connected = false; scan_while_connected = false;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, strWIDList, result = wilc_send_config_pkt(vif->wilc, SET_CFG, strWIDList,
u32WidsCount, u32WidsCount,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
...@@ -947,7 +942,7 @@ static s32 Handle_ScanDone(struct wilc_vif *vif, ...@@ -947,7 +942,7 @@ static s32 Handle_ScanDone(struct wilc_vif *vif,
wid.val = (s8 *)&u8abort_running_scan; wid.val = (s8 *)&u8abort_running_scan;
wid.size = sizeof(char); wid.size = sizeof(char);
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) { if (result) {
...@@ -1203,7 +1198,7 @@ static s32 Handle_Connect(struct wilc_vif *vif, ...@@ -1203,7 +1198,7 @@ static s32 Handle_Connect(struct wilc_vif *vif,
PRINT_D(GENERIC_DBG, "save bssid = %pM\n", wilc_connected_ssid); PRINT_D(GENERIC_DBG, "save bssid = %pM\n", wilc_connected_ssid);
} }
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, strWIDList, result = wilc_send_config_pkt(vif->wilc, SET_CFG, strWIDList,
u32WidsCount, u32WidsCount,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) { if (result) {
...@@ -1271,7 +1266,6 @@ static s32 Handle_FlushConnect(struct wilc_vif *vif) ...@@ -1271,7 +1266,6 @@ static s32 Handle_FlushConnect(struct wilc_vif *vif)
struct wid strWIDList[5]; struct wid strWIDList[5];
u32 u32WidsCount = 0; u32 u32WidsCount = 0;
u8 *pu8CurrByte = NULL; u8 *pu8CurrByte = NULL;
struct host_if_drv *hif_drv = vif->hif_drv;
strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_ASSOCIATE; strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_ASSOCIATE;
strWIDList[u32WidsCount].type = WID_BIN_DATA; strWIDList[u32WidsCount].type = WID_BIN_DATA;
...@@ -1302,7 +1296,7 @@ static s32 Handle_FlushConnect(struct wilc_vif *vif) ...@@ -1302,7 +1296,7 @@ static s32 Handle_FlushConnect(struct wilc_vif *vif)
u32WidsCount++; u32WidsCount++;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, strWIDList, result = wilc_send_config_pkt(vif->wilc, SET_CFG, strWIDList,
u32WidsCount, u32WidsCount,
wilc_get_vif_idx(join_req_vif)); wilc_get_vif_idx(join_req_vif));
if (result) { if (result) {
...@@ -1365,7 +1359,7 @@ static s32 Handle_ConnectTimeout(struct wilc_vif *vif) ...@@ -1365,7 +1359,7 @@ static s32 Handle_ConnectTimeout(struct wilc_vif *vif)
PRINT_D(HOSTINF_DBG, "Sending disconnect request\n"); PRINT_D(HOSTINF_DBG, "Sending disconnect request\n");
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) if (result)
PRINT_ER("Failed to send dissconect config packet\n"); PRINT_ER("Failed to send dissconect config packet\n");
...@@ -1759,7 +1753,7 @@ static int Handle_Key(struct wilc_vif *vif, ...@@ -1759,7 +1753,7 @@ static int Handle_Key(struct wilc_vif *vif,
strWIDList[3].size = pstrHostIFkeyAttr->attr.wep.key_len; strWIDList[3].size = pstrHostIFkeyAttr->attr.wep.key_len;
strWIDList[3].val = (s8 *)pu8keybuf; strWIDList[3].val = (s8 *)pu8keybuf;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, result = wilc_send_config_pkt(vif->wilc, SET_CFG,
strWIDList, 4, strWIDList, 4,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
kfree(pu8keybuf); kfree(pu8keybuf);
...@@ -1781,7 +1775,7 @@ static int Handle_Key(struct wilc_vif *vif, ...@@ -1781,7 +1775,7 @@ static int Handle_Key(struct wilc_vif *vif,
wid.val = (s8 *)pu8keybuf; wid.val = (s8 *)pu8keybuf;
wid.size = pstrHostIFkeyAttr->attr.wep.key_len + 2; wid.size = pstrHostIFkeyAttr->attr.wep.key_len + 2;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, result = wilc_send_config_pkt(vif->wilc, SET_CFG,
&wid, 1, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
kfree(pu8keybuf); kfree(pu8keybuf);
...@@ -1794,7 +1788,7 @@ static int Handle_Key(struct wilc_vif *vif, ...@@ -1794,7 +1788,7 @@ static int Handle_Key(struct wilc_vif *vif,
wid.val = s8idxarray; wid.val = s8idxarray;
wid.size = 1; wid.size = 1;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, result = wilc_send_config_pkt(vif->wilc, SET_CFG,
&wid, 1, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
} else { } else {
...@@ -1805,7 +1799,7 @@ static int Handle_Key(struct wilc_vif *vif, ...@@ -1805,7 +1799,7 @@ static int Handle_Key(struct wilc_vif *vif,
PRINT_D(HOSTINF_DBG, "Setting default key index\n"); PRINT_D(HOSTINF_DBG, "Setting default key index\n");
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, result = wilc_send_config_pkt(vif->wilc, SET_CFG,
&wid, 1, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
} }
...@@ -1839,7 +1833,7 @@ static int Handle_Key(struct wilc_vif *vif, ...@@ -1839,7 +1833,7 @@ static int Handle_Key(struct wilc_vif *vif,
strWIDList[1].val = (s8 *)pu8keybuf; strWIDList[1].val = (s8 *)pu8keybuf;
strWIDList[1].size = RX_MIC_KEY_MSG_LEN; strWIDList[1].size = RX_MIC_KEY_MSG_LEN;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, result = wilc_send_config_pkt(vif->wilc, SET_CFG,
strWIDList, 2, strWIDList, 2,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
...@@ -1871,7 +1865,7 @@ static int Handle_Key(struct wilc_vif *vif, ...@@ -1871,7 +1865,7 @@ static int Handle_Key(struct wilc_vif *vif,
wid.val = (s8 *)pu8keybuf; wid.val = (s8 *)pu8keybuf;
wid.size = RX_MIC_KEY_MSG_LEN; wid.size = RX_MIC_KEY_MSG_LEN;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, result = wilc_send_config_pkt(vif->wilc, SET_CFG,
&wid, 1, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
...@@ -1911,7 +1905,7 @@ static int Handle_Key(struct wilc_vif *vif, ...@@ -1911,7 +1905,7 @@ static int Handle_Key(struct wilc_vif *vif,
strWIDList[1].val = (s8 *)pu8keybuf; strWIDList[1].val = (s8 *)pu8keybuf;
strWIDList[1].size = PTK_KEY_MSG_LEN + 1; strWIDList[1].size = PTK_KEY_MSG_LEN + 1;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, result = wilc_send_config_pkt(vif->wilc, SET_CFG,
strWIDList, 2, strWIDList, 2,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
kfree(pu8keybuf); kfree(pu8keybuf);
...@@ -1934,7 +1928,7 @@ static int Handle_Key(struct wilc_vif *vif, ...@@ -1934,7 +1928,7 @@ static int Handle_Key(struct wilc_vif *vif,
wid.val = (s8 *)pu8keybuf; wid.val = (s8 *)pu8keybuf;
wid.size = PTK_KEY_MSG_LEN; wid.size = PTK_KEY_MSG_LEN;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, result = wilc_send_config_pkt(vif->wilc, SET_CFG,
&wid, 1, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
kfree(pu8keybuf); kfree(pu8keybuf);
...@@ -1970,7 +1964,7 @@ static int Handle_Key(struct wilc_vif *vif, ...@@ -1970,7 +1964,7 @@ static int Handle_Key(struct wilc_vif *vif,
wid.val = (s8 *)pu8keybuf; wid.val = (s8 *)pu8keybuf;
wid.size = (pstrHostIFkeyAttr->attr.pmkid.numpmkid * PMKSA_KEY_LEN) + 1; wid.size = (pstrHostIFkeyAttr->attr.pmkid.numpmkid * PMKSA_KEY_LEN) + 1;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
kfree(pu8keybuf); kfree(pu8keybuf);
...@@ -2003,7 +1997,7 @@ static void Handle_Disconnect(struct wilc_vif *vif) ...@@ -2003,7 +1997,7 @@ static void Handle_Disconnect(struct wilc_vif *vif)
eth_zero_addr(wilc_connected_ssid); eth_zero_addr(wilc_connected_ssid);
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) { if (result) {
...@@ -2094,7 +2088,7 @@ static s32 Handle_GetChnl(struct wilc_vif *vif) ...@@ -2094,7 +2088,7 @@ static s32 Handle_GetChnl(struct wilc_vif *vif)
PRINT_D(HOSTINF_DBG, "Getting channel value\n"); PRINT_D(HOSTINF_DBG, "Getting channel value\n");
result = wilc_send_config_pkt(hif_drv->wilc, GET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, GET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) { if (result) {
...@@ -2119,7 +2113,7 @@ static void Handle_GetRssi(struct wilc_vif *vif) ...@@ -2119,7 +2113,7 @@ static void Handle_GetRssi(struct wilc_vif *vif)
PRINT_D(HOSTINF_DBG, "Getting RSSI value\n"); PRINT_D(HOSTINF_DBG, "Getting RSSI value\n");
result = wilc_send_config_pkt(vif->hif_drv->wilc, GET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, GET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) { if (result) {
PRINT_ER("Failed to get RSSI value\n"); PRINT_ER("Failed to get RSSI value\n");
...@@ -2144,7 +2138,7 @@ static void Handle_GetLinkspeed(struct wilc_vif *vif) ...@@ -2144,7 +2138,7 @@ static void Handle_GetLinkspeed(struct wilc_vif *vif)
PRINT_D(HOSTINF_DBG, "Getting LINKSPEED value\n"); PRINT_D(HOSTINF_DBG, "Getting LINKSPEED value\n");
result = wilc_send_config_pkt(hif_drv->wilc, GET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, GET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) { if (result) {
PRINT_ER("Failed to get LINKSPEED value\n"); PRINT_ER("Failed to get LINKSPEED value\n");
...@@ -2159,7 +2153,6 @@ static s32 Handle_GetStatistics(struct wilc_vif *vif, ...@@ -2159,7 +2153,6 @@ static s32 Handle_GetStatistics(struct wilc_vif *vif,
{ {
struct wid strWIDList[5]; struct wid strWIDList[5];
u32 u32WidsCount = 0, result = 0; u32 u32WidsCount = 0, result = 0;
struct host_if_drv *hif_drv = vif->hif_drv;
strWIDList[u32WidsCount].id = WID_LINKSPEED; strWIDList[u32WidsCount].id = WID_LINKSPEED;
strWIDList[u32WidsCount].type = WID_CHAR; strWIDList[u32WidsCount].type = WID_CHAR;
...@@ -2191,7 +2184,7 @@ static s32 Handle_GetStatistics(struct wilc_vif *vif, ...@@ -2191,7 +2184,7 @@ static s32 Handle_GetStatistics(struct wilc_vif *vif,
strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->tx_fail_cnt; strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->tx_fail_cnt;
u32WidsCount++; u32WidsCount++;
result = wilc_send_config_pkt(hif_drv->wilc, GET_CFG, strWIDList, result = wilc_send_config_pkt(vif->wilc, GET_CFG, strWIDList,
u32WidsCount, u32WidsCount,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
...@@ -2220,7 +2213,7 @@ static s32 Handle_Get_InActiveTime(struct wilc_vif *vif, ...@@ -2220,7 +2213,7 @@ static s32 Handle_Get_InActiveTime(struct wilc_vif *vif,
PRINT_D(CFG80211_DBG, "SETING STA inactive time\n"); PRINT_D(CFG80211_DBG, "SETING STA inactive time\n");
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) { if (result) {
...@@ -2233,7 +2226,7 @@ static s32 Handle_Get_InActiveTime(struct wilc_vif *vif, ...@@ -2233,7 +2226,7 @@ static s32 Handle_Get_InActiveTime(struct wilc_vif *vif,
wid.val = (s8 *)&inactive_time; wid.val = (s8 *)&inactive_time;
wid.size = sizeof(u32); wid.size = sizeof(u32);
result = wilc_send_config_pkt(hif_drv->wilc, GET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, GET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) { if (result) {
...@@ -2254,7 +2247,6 @@ static void Handle_AddBeacon(struct wilc_vif *vif, ...@@ -2254,7 +2247,6 @@ static void Handle_AddBeacon(struct wilc_vif *vif,
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
u8 *pu8CurrByte; u8 *pu8CurrByte;
struct host_if_drv *hif_drv = vif->hif_drv;
PRINT_D(HOSTINF_DBG, "Adding BEACON\n"); PRINT_D(HOSTINF_DBG, "Adding BEACON\n");
...@@ -2293,7 +2285,7 @@ static void Handle_AddBeacon(struct wilc_vif *vif, ...@@ -2293,7 +2285,7 @@ static void Handle_AddBeacon(struct wilc_vif *vif,
memcpy(pu8CurrByte, pstrSetBeaconParam->tail, pstrSetBeaconParam->tail_len); memcpy(pu8CurrByte, pstrSetBeaconParam->tail, pstrSetBeaconParam->tail_len);
pu8CurrByte += pstrSetBeaconParam->tail_len; pu8CurrByte += pstrSetBeaconParam->tail_len;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) if (result)
PRINT_ER("Failed to send add beacon config packet\n"); PRINT_ER("Failed to send add beacon config packet\n");
...@@ -2309,7 +2301,6 @@ static void Handle_DelBeacon(struct wilc_vif *vif) ...@@ -2309,7 +2301,6 @@ static void Handle_DelBeacon(struct wilc_vif *vif)
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
u8 *pu8CurrByte; u8 *pu8CurrByte;
struct host_if_drv *hif_drv = vif->hif_drv;
wid.id = (u16)WID_DEL_BEACON; wid.id = (u16)WID_DEL_BEACON;
wid.type = WID_CHAR; wid.type = WID_CHAR;
...@@ -2323,7 +2314,7 @@ static void Handle_DelBeacon(struct wilc_vif *vif) ...@@ -2323,7 +2314,7 @@ static void Handle_DelBeacon(struct wilc_vif *vif)
PRINT_D(HOSTINF_DBG, "Deleting BEACON\n"); PRINT_D(HOSTINF_DBG, "Deleting BEACON\n");
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) if (result)
PRINT_ER("Failed to send delete beacon config packet\n"); PRINT_ER("Failed to send delete beacon config packet\n");
...@@ -2383,7 +2374,6 @@ static void Handle_AddStation(struct wilc_vif *vif, ...@@ -2383,7 +2374,6 @@ static void Handle_AddStation(struct wilc_vif *vif,
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
u8 *pu8CurrByte; u8 *pu8CurrByte;
struct host_if_drv *hif_drv = vif->hif_drv;
PRINT_D(HOSTINF_DBG, "Handling add station\n"); PRINT_D(HOSTINF_DBG, "Handling add station\n");
wid.id = (u16)WID_ADD_STA; wid.id = (u16)WID_ADD_STA;
...@@ -2397,7 +2387,7 @@ static void Handle_AddStation(struct wilc_vif *vif, ...@@ -2397,7 +2387,7 @@ static void Handle_AddStation(struct wilc_vif *vif,
pu8CurrByte = wid.val; pu8CurrByte = wid.val;
pu8CurrByte += WILC_HostIf_PackStaParam(pu8CurrByte, pstrStationParam); pu8CurrByte += WILC_HostIf_PackStaParam(pu8CurrByte, pstrStationParam);
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result != 0) if (result != 0)
PRINT_ER("Failed to send add station config packet\n"); PRINT_ER("Failed to send add station config packet\n");
...@@ -2415,7 +2405,6 @@ static void Handle_DelAllSta(struct wilc_vif *vif, ...@@ -2415,7 +2405,6 @@ static void Handle_DelAllSta(struct wilc_vif *vif,
u8 *pu8CurrByte; u8 *pu8CurrByte;
u8 i; u8 i;
u8 au8Zero_Buff[6] = {0}; u8 au8Zero_Buff[6] = {0};
struct host_if_drv *hif_drv = vif->hif_drv;
wid.id = (u16)WID_DEL_ALL_STA; wid.id = (u16)WID_DEL_ALL_STA;
wid.type = WID_STR; wid.type = WID_STR;
...@@ -2440,7 +2429,7 @@ static void Handle_DelAllSta(struct wilc_vif *vif, ...@@ -2440,7 +2429,7 @@ static void Handle_DelAllSta(struct wilc_vif *vif,
pu8CurrByte += ETH_ALEN; pu8CurrByte += ETH_ALEN;
} }
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) if (result)
PRINT_ER("Failed to send add station config packet\n"); PRINT_ER("Failed to send add station config packet\n");
...@@ -2457,7 +2446,6 @@ static void Handle_DelStation(struct wilc_vif *vif, ...@@ -2457,7 +2446,6 @@ static void Handle_DelStation(struct wilc_vif *vif,
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
u8 *pu8CurrByte; u8 *pu8CurrByte;
struct host_if_drv *hif_drv = vif->hif_drv;
wid.id = (u16)WID_REMOVE_STA; wid.id = (u16)WID_REMOVE_STA;
wid.type = WID_BIN; wid.type = WID_BIN;
...@@ -2473,7 +2461,7 @@ static void Handle_DelStation(struct wilc_vif *vif, ...@@ -2473,7 +2461,7 @@ static void Handle_DelStation(struct wilc_vif *vif,
memcpy(pu8CurrByte, pstrDelStaParam->mac_addr, ETH_ALEN); memcpy(pu8CurrByte, pstrDelStaParam->mac_addr, ETH_ALEN);
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) if (result)
PRINT_ER("Failed to send add station config packet\n"); PRINT_ER("Failed to send add station config packet\n");
...@@ -2488,7 +2476,6 @@ static void Handle_EditStation(struct wilc_vif *vif, ...@@ -2488,7 +2476,6 @@ static void Handle_EditStation(struct wilc_vif *vif,
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
u8 *pu8CurrByte; u8 *pu8CurrByte;
struct host_if_drv *hif_drv = vif->hif_drv;
wid.id = (u16)WID_EDIT_STA; wid.id = (u16)WID_EDIT_STA;
wid.type = WID_BIN; wid.type = WID_BIN;
...@@ -2502,7 +2489,7 @@ static void Handle_EditStation(struct wilc_vif *vif, ...@@ -2502,7 +2489,7 @@ static void Handle_EditStation(struct wilc_vif *vif,
pu8CurrByte = wid.val; pu8CurrByte = wid.val;
pu8CurrByte += WILC_HostIf_PackStaParam(pu8CurrByte, pstrStationParam); pu8CurrByte += WILC_HostIf_PackStaParam(pu8CurrByte, pstrStationParam);
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) if (result)
PRINT_ER("Failed to send edit station config packet\n"); PRINT_ER("Failed to send edit station config packet\n");
...@@ -2564,7 +2551,7 @@ static int Handle_RemainOnChan(struct wilc_vif *vif, ...@@ -2564,7 +2551,7 @@ static int Handle_RemainOnChan(struct wilc_vif *vif,
wid.val[0] = u8remain_on_chan_flag; wid.val[0] = u8remain_on_chan_flag;
wid.val[1] = (s8)pstrHostIfRemainOnChan->ch; wid.val[1] = (s8)pstrHostIfRemainOnChan->ch;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result != 0) if (result != 0)
PRINT_ER("Failed to set remain on channel\n"); PRINT_ER("Failed to set remain on channel\n");
...@@ -2593,7 +2580,6 @@ static int Handle_RegisterFrame(struct wilc_vif *vif, ...@@ -2593,7 +2580,6 @@ static int Handle_RegisterFrame(struct wilc_vif *vif,
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
u8 *pu8CurrByte; u8 *pu8CurrByte;
struct host_if_drv *hif_drv = vif->hif_drv;
PRINT_D(HOSTINF_DBG, "Handling frame register : %d FrameType: %d\n", PRINT_D(HOSTINF_DBG, "Handling frame register : %d FrameType: %d\n",
pstrHostIfRegisterFrame->reg, pstrHostIfRegisterFrame->reg,
...@@ -2613,7 +2599,7 @@ static int Handle_RegisterFrame(struct wilc_vif *vif, ...@@ -2613,7 +2599,7 @@ static int Handle_RegisterFrame(struct wilc_vif *vif,
wid.size = sizeof(u16) + 2; wid.size = sizeof(u16) + 2;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) { if (result) {
PRINT_ER("Failed to frame register config packet\n"); PRINT_ER("Failed to frame register config packet\n");
...@@ -2648,7 +2634,7 @@ static u32 Handle_ListenStateExpired(struct wilc_vif *vif, ...@@ -2648,7 +2634,7 @@ static u32 Handle_ListenStateExpired(struct wilc_vif *vif,
wid.val[0] = u8remain_on_chan_flag; wid.val[0] = u8remain_on_chan_flag;
wid.val[1] = FALSE_FRMWR_CHANNEL; wid.val[1] = FALSE_FRMWR_CHANNEL;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result != 0) { if (result != 0) {
PRINT_ER("Failed to set remain on channel\n"); PRINT_ER("Failed to set remain on channel\n");
...@@ -2693,7 +2679,6 @@ static void Handle_PowerManagement(struct wilc_vif *vif, ...@@ -2693,7 +2679,6 @@ static void Handle_PowerManagement(struct wilc_vif *vif,
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
s8 s8PowerMode; s8 s8PowerMode;
struct host_if_drv *hif_drv = vif->hif_drv;
wid.id = (u16)WID_POWER_MANAGEMENT; wid.id = (u16)WID_POWER_MANAGEMENT;
...@@ -2707,7 +2692,7 @@ static void Handle_PowerManagement(struct wilc_vif *vif, ...@@ -2707,7 +2692,7 @@ static void Handle_PowerManagement(struct wilc_vif *vif,
PRINT_D(HOSTINF_DBG, "Handling Power Management\n"); PRINT_D(HOSTINF_DBG, "Handling Power Management\n");
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) if (result)
PRINT_ER("Failed to send power management config packet\n"); PRINT_ER("Failed to send power management config packet\n");
...@@ -2719,7 +2704,6 @@ static void Handle_SetMulticastFilter(struct wilc_vif *vif, ...@@ -2719,7 +2704,6 @@ static void Handle_SetMulticastFilter(struct wilc_vif *vif,
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
u8 *pu8CurrByte; u8 *pu8CurrByte;
struct host_if_drv *hif_drv = vif->hif_drv;
PRINT_D(HOSTINF_DBG, "Setup Multicast Filter\n"); PRINT_D(HOSTINF_DBG, "Setup Multicast Filter\n");
...@@ -2745,7 +2729,7 @@ static void Handle_SetMulticastFilter(struct wilc_vif *vif, ...@@ -2745,7 +2729,7 @@ static void Handle_SetMulticastFilter(struct wilc_vif *vif,
memcpy(pu8CurrByte, wilc_multicast_mac_addr_list, memcpy(pu8CurrByte, wilc_multicast_mac_addr_list,
((strHostIfSetMulti->cnt) * ETH_ALEN)); ((strHostIfSetMulti->cnt) * ETH_ALEN));
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) if (result)
PRINT_ER("Failed to send setup multicast config packet\n"); PRINT_ER("Failed to send setup multicast config packet\n");
...@@ -2760,7 +2744,6 @@ static s32 Handle_DelAllRxBASessions(struct wilc_vif *vif, ...@@ -2760,7 +2744,6 @@ static s32 Handle_DelAllRxBASessions(struct wilc_vif *vif,
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
char *ptr = NULL; char *ptr = NULL;
struct host_if_drv *hif_drv = vif->hif_drv;
PRINT_D(GENERIC_DBG, "Delete Block Ack session with\nBSSID = %.2x:%.2x:%.2x\nTID=%d\n", PRINT_D(GENERIC_DBG, "Delete Block Ack session with\nBSSID = %.2x:%.2x:%.2x\nTID=%d\n",
strHostIfBASessionInfo->bssid[0], strHostIfBASessionInfo->bssid[0],
...@@ -2782,7 +2765,7 @@ static s32 Handle_DelAllRxBASessions(struct wilc_vif *vif, ...@@ -2782,7 +2765,7 @@ static s32 Handle_DelAllRxBASessions(struct wilc_vif *vif,
*ptr++ = 0; *ptr++ = 0;
*ptr++ = 32; *ptr++ = 32;
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) if (result)
PRINT_D(HOSTINF_DBG, "Couldn't delete BA Session\n"); PRINT_D(HOSTINF_DBG, "Couldn't delete BA Session\n");
...@@ -3519,7 +3502,7 @@ static s32 host_int_get_assoc_res_info(struct wilc_vif *vif, ...@@ -3519,7 +3502,7 @@ static s32 host_int_get_assoc_res_info(struct wilc_vif *vif,
wid.val = pu8AssocRespInfo; wid.val = pu8AssocRespInfo;
wid.size = u32MaxAssocRespInfoLen; wid.size = u32MaxAssocRespInfoLen;
result = wilc_send_config_pkt(hif_drv->wilc, GET_CFG, &wid, 1, result = wilc_send_config_pkt(vif->wilc, GET_CFG, &wid, 1,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) { if (result) {
*pu32RcvdAssocRespInfoLen = 0; *pu32RcvdAssocRespInfoLen = 0;
...@@ -3814,7 +3797,6 @@ s32 wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler) ...@@ -3814,7 +3797,6 @@ s32 wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
result = -ENOMEM; result = -ENOMEM;
goto _fail_; goto _fail_;
} }
hif_drv->wilc = wilc;
*hif_drv_handler = hif_drv; *hif_drv_handler = hif_drv;
wilc_optaining_ip = false; wilc_optaining_ip = false;
......
drivers/staging/wilc1000/host_interface.h
View file @ cd2920a5
...@@ -261,7 +261,6 @@ enum p2p_listen_state { ...@@ -261,7 +261,6 @@ enum p2p_listen_state {
struct wilc; struct wilc;
struct host_if_drv { struct host_if_drv {
struct wilc *wilc;
struct user_scan_req usr_scan_req; struct user_scan_req usr_scan_req;
struct user_conn_req usr_conn_req; struct user_conn_req usr_conn_req;
struct remain_ch remain_on_ch; struct remain_ch remain_on_ch;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7