diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 7cfc722d6a57d4eb8e60eba005105206d2d28f91..397ef617656ed87b14027c28c9bd9d5b34a3441d 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -971,11 +971,11 @@ static s32 Handle_Connect(struct wilc_vif *vif, hif_drv->usr_conn_req.ssid_len = pstrHostIFconnectAttr->ssid_len; if (pstrHostIFconnectAttr->ssid) { - hif_drv->usr_conn_req.pu8ssid = kmalloc(pstrHostIFconnectAttr->ssid_len + 1, GFP_KERNEL); - memcpy(hif_drv->usr_conn_req.pu8ssid, + hif_drv->usr_conn_req.ssid = kmalloc(pstrHostIFconnectAttr->ssid_len + 1, GFP_KERNEL); + memcpy(hif_drv->usr_conn_req.ssid, pstrHostIFconnectAttr->ssid, pstrHostIFconnectAttr->ssid_len); - hif_drv->usr_conn_req.pu8ssid[pstrHostIFconnectAttr->ssid_len] = '\0'; + hif_drv->usr_conn_req.ssid[pstrHostIFconnectAttr->ssid_len] = '\0'; } hif_drv->usr_conn_req.ies_len = pstrHostIFconnectAttr->ies_len; @@ -1307,8 +1307,8 @@ static s32 Handle_ConnectTimeout(struct wilc_vif *vif) PRINT_ER("Failed to send dissconect config packet\n"); hif_drv->usr_conn_req.ssid_len = 0; - kfree(hif_drv->usr_conn_req.pu8ssid); - hif_drv->usr_conn_req.pu8ssid = NULL; + kfree(hif_drv->usr_conn_req.ssid); + hif_drv->usr_conn_req.ssid = NULL; kfree(hif_drv->usr_conn_req.bssid); hif_drv->usr_conn_req.bssid = NULL; hif_drv->usr_conn_req.ies_len = 0; @@ -1548,8 +1548,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, kfree(strConnectInfo.pu8ReqIEs); strConnectInfo.pu8ReqIEs = NULL; hif_drv->usr_conn_req.ssid_len = 0; - kfree(hif_drv->usr_conn_req.pu8ssid); - hif_drv->usr_conn_req.pu8ssid = NULL; + kfree(hif_drv->usr_conn_req.ssid); + hif_drv->usr_conn_req.ssid = NULL; kfree(hif_drv->usr_conn_req.bssid); hif_drv->usr_conn_req.bssid = NULL; hif_drv->usr_conn_req.ies_len = 0; @@ -1584,8 +1584,8 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif, eth_zero_addr(hif_drv->assoc_bssid); hif_drv->usr_conn_req.ssid_len = 0; - kfree(hif_drv->usr_conn_req.pu8ssid); - hif_drv->usr_conn_req.pu8ssid = NULL; + kfree(hif_drv->usr_conn_req.ssid); + hif_drv->usr_conn_req.ssid = NULL; kfree(hif_drv->usr_conn_req.bssid); hif_drv->usr_conn_req.bssid = NULL; hif_drv->usr_conn_req.ies_len = 0; @@ -1942,8 +1942,8 @@ static void Handle_Disconnect(struct wilc_vif *vif) eth_zero_addr(hif_drv->assoc_bssid); hif_drv->usr_conn_req.ssid_len = 0; - kfree(hif_drv->usr_conn_req.pu8ssid); - hif_drv->usr_conn_req.pu8ssid = NULL; + kfree(hif_drv->usr_conn_req.ssid); + hif_drv->usr_conn_req.ssid = NULL; kfree(hif_drv->usr_conn_req.bssid); hif_drv->usr_conn_req.bssid = NULL; hif_drv->usr_conn_req.ies_len = 0; diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 18d67e0586bcd2c9d064de6889cf4196e4e96b32..30acf40e855c14f0f5554bbc5ca85826e652ef53 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -204,7 +204,7 @@ struct user_scan_req { struct user_conn_req { u8 *bssid; - u8 *pu8ssid; + u8 *ssid; u8 u8security; enum AUTHTYPE auth_type; size_t ssid_len;