Commit e554a305 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: rename wilc_connected_SSID variable

This patch renames wilc_connected_SSID variable to wilc_connected_ssid
to avoid camelcase.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7e872df9
...@@ -987,7 +987,7 @@ static s32 Handle_ScanDone(struct host_if_drv *hif_drv, ...@@ -987,7 +987,7 @@ static s32 Handle_ScanDone(struct host_if_drv *hif_drv,
return result; return result;
} }
u8 wilc_connected_SSID[6] = {0}; u8 wilc_connected_ssid[6] = {0};
static s32 Handle_Connect(struct host_if_drv *hif_drv, static s32 Handle_Connect(struct host_if_drv *hif_drv,
struct connect_attr *pstrHostIFconnectAttr) struct connect_attr *pstrHostIFconnectAttr)
{ {
...@@ -999,7 +999,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, ...@@ -999,7 +999,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
PRINT_D(GENERIC_DBG, "Handling connect request\n"); PRINT_D(GENERIC_DBG, "Handling connect request\n");
if (memcmp(pstrHostIFconnectAttr->bssid, wilc_connected_SSID, ETH_ALEN) == 0) { if (memcmp(pstrHostIFconnectAttr->bssid, wilc_connected_ssid, ETH_ALEN) == 0) {
result = 0; result = 0;
PRINT_ER("Trying to connect to an already connected AP, Discard connect request\n"); PRINT_ER("Trying to connect to an already connected AP, Discard connect request\n");
return result; return result;
...@@ -1212,10 +1212,11 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv, ...@@ -1212,10 +1212,11 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
PRINT_D(GENERIC_DBG, "send HOST_IF_WAITING_CONN_RESP\n"); PRINT_D(GENERIC_DBG, "send HOST_IF_WAITING_CONN_RESP\n");
if (pstrHostIFconnectAttr->bssid) { if (pstrHostIFconnectAttr->bssid) {
memcpy(wilc_connected_SSID, pstrHostIFconnectAttr->bssid, ETH_ALEN); memcpy(wilc_connected_ssid,
pstrHostIFconnectAttr->bssid, ETH_ALEN);
PRINT_D(GENERIC_DBG, "save Bssid = %pM\n", pstrHostIFconnectAttr->bssid); PRINT_D(GENERIC_DBG, "save Bssid = %pM\n",
PRINT_D(GENERIC_DBG, "save bssid = %pM\n", wilc_connected_SSID); pstrHostIFconnectAttr->bssid);
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(hif_drv->wilc, SET_CFG, strWIDList,
...@@ -1389,7 +1390,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv *hif_drv) ...@@ -1389,7 +1390,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv *hif_drv)
hif_drv->usr_conn_req.ies_len = 0; hif_drv->usr_conn_req.ies_len = 0;
kfree(hif_drv->usr_conn_req.ies); kfree(hif_drv->usr_conn_req.ies);
eth_zero_addr(wilc_connected_SSID); eth_zero_addr(wilc_connected_ssid);
if (join_req && join_req_drv == hif_drv) { if (join_req && join_req_drv == hif_drv) {
kfree(join_req); kfree(join_req);
...@@ -1585,11 +1586,10 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv, ...@@ -1585,11 +1586,10 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv,
if ((u8MacStatus == MAC_CONNECTED) && if ((u8MacStatus == MAC_CONNECTED) &&
(strConnectInfo.u16ConnectStatus != SUCCESSFUL_STATUSCODE)) { (strConnectInfo.u16ConnectStatus != SUCCESSFUL_STATUSCODE)) {
PRINT_ER("Received MAC status is MAC_CONNECTED while the received status code in Asoc Resp is not SUCCESSFUL_STATUSCODE\n"); PRINT_ER("Received MAC status is MAC_CONNECTED while the received status code in Asoc Resp is not SUCCESSFUL_STATUSCODE\n");
eth_zero_addr(wilc_connected_SSID); eth_zero_addr(wilc_connected_ssid);
} else if (u8MacStatus == MAC_DISCONNECTED) { } else if (u8MacStatus == MAC_DISCONNECTED) {
PRINT_ER("Received MAC status is MAC_DISCONNECTED\n"); PRINT_ER("Received MAC status is MAC_DISCONNECTED\n");
eth_zero_addr(wilc_connected_SSID); eth_zero_addr(wilc_connected_ssid);
} }
if (hif_drv->usr_conn_req.pu8bssid) { if (hif_drv->usr_conn_req.pu8bssid) {
...@@ -2007,7 +2007,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv) ...@@ -2007,7 +2007,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
wilc_optaining_ip = false; wilc_optaining_ip = false;
wilc_set_power_mgmt(hif_drv, 0, 0); wilc_set_power_mgmt(hif_drv, 0, 0);
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(hif_drv->wilc, SET_CFG, &wid, 1,
get_id_from_handler(hif_drv)); get_id_from_handler(hif_drv));
......
...@@ -398,7 +398,7 @@ s32 wilc_get_statistics(struct host_if_drv *hWFIDrv, ...@@ -398,7 +398,7 @@ s32 wilc_get_statistics(struct host_if_drv *hWFIDrv,
void wilc_resolve_disconnect_aberration(struct host_if_drv *hif_drv); void wilc_resolve_disconnect_aberration(struct host_if_drv *hif_drv);
extern bool wilc_optaining_ip; extern bool wilc_optaining_ip;
extern u8 wilc_connected_SSID[6]; extern u8 wilc_connected_ssid[6];
extern u8 wilc_multicast_mac_addr_list[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN]; extern u8 wilc_multicast_mac_addr_list[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];
extern int wilc_connecting; extern int wilc_connecting;
......
...@@ -588,7 +588,7 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent, ...@@ -588,7 +588,7 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
* = SUCCESSFUL_STATUSCODE, while mac status is MAC_DISCONNECTED (which means something wrong happened) */ * = SUCCESSFUL_STATUSCODE, while mac status is MAC_DISCONNECTED (which means something wrong happened) */
u16ConnectStatus = WLAN_STATUS_UNSPECIFIED_FAILURE; u16ConnectStatus = WLAN_STATUS_UNSPECIFIED_FAILURE;
wilc_wlan_set_bssid(priv->dev, NullBssid); wilc_wlan_set_bssid(priv->dev, NullBssid);
eth_zero_addr(wilc_connected_SSID); eth_zero_addr(wilc_connected_ssid);
if (!pstrWFIDrv->p2p_connect) if (!pstrWFIDrv->p2p_connect)
wlan_channel = INVALID_CHANNEL; wlan_channel = INVALID_CHANNEL;
...@@ -646,7 +646,7 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent, ...@@ -646,7 +646,7 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
wilc_ie = false; wilc_ie = false;
eth_zero_addr(priv->au8AssociatedBss); eth_zero_addr(priv->au8AssociatedBss);
wilc_wlan_set_bssid(priv->dev, NullBssid); wilc_wlan_set_bssid(priv->dev, NullBssid);
eth_zero_addr(wilc_connected_SSID); eth_zero_addr(wilc_connected_ssid);
if (!pstrWFIDrv->p2p_connect) if (!pstrWFIDrv->p2p_connect)
wlan_channel = INVALID_CHANNEL; wlan_channel = INVALID_CHANNEL;
......
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