mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

staging: wilc1000: rename CfgConnectResult() and its local variable names 

This is cleanup patch,to avoid use of camelCase for variable name
and function names in CfgConnectResult().

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-01-16 19:32:24 +05:30 committed by Greg Kroah-Hartman
parent ffde267008
commit 4c56ddbac9
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View File

@ -469,92 +469,92 @@ static void CfgScanResult(enum scan_event scan_event,
int wilc_connecting;
static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
struct connect_info *pstrConnectInfo,
u8 u8MacStatus,
struct disconnect_info *pstrDisconnectNotifInfo,
void *pUserVoid)
static void cfg_connect_result(enum conn_event conn_disconn_evt,
struct connect_info *conn_info,
u8 mac_status,
struct disconnect_info *disconn_info,
void *priv_data)
{
struct wilc_priv *priv;
struct net_device *dev;
struct host_if_drv *pstrWFIDrv;
u8 NullBssid[ETH_ALEN] = {0};
struct host_if_drv *wfi_drv;
u8 null_bssid[ETH_ALEN] = {0};
struct wilc *wl;
struct wilc_vif *vif;
wilc_connecting = 0;
priv = pUserVoid;
priv = priv_data;
dev = priv->dev;
vif = netdev_priv(dev);
wl = vif->wilc;
pstrWFIDrv = (struct host_if_drv *)priv->hif_drv;
wfi_drv = (struct host_if_drv *)priv->hif_drv;
if (enuConnDisconnEvent == CONN_DISCONN_EVENT_CONN_RESP) {
u16 u16ConnectStatus;
if (conn_disconn_evt == CONN_DISCONN_EVENT_CONN_RESP) {
u16 connect_status;
u16ConnectStatus = pstrConnectInfo->status;
connect_status = conn_info->status;
if ((u8MacStatus == MAC_DISCONNECTED) &&
(pstrConnectInfo->status == SUCCESSFUL_STATUSCODE)) {
u16ConnectStatus = WLAN_STATUS_UNSPECIFIED_FAILURE;
wilc_wlan_set_bssid(priv->dev, NullBssid,
if ((mac_status == MAC_DISCONNECTED) &&
(conn_info->status == SUCCESSFUL_STATUSCODE)) {
connect_status = WLAN_STATUS_UNSPECIFIED_FAILURE;
wilc_wlan_set_bssid(priv->dev, null_bssid,
STATION_MODE);
eth_zero_addr(wilc_connected_ssid);
if (!pstrWFIDrv->p2p_connect)
if (!wfi_drv->p2p_connect)
wlan_channel = INVALID_CHANNEL;
netdev_err(dev, "Unspecified failure\n");
}
if (u16ConnectStatus == WLAN_STATUS_SUCCESS) {
bool bNeedScanRefresh = false;
if (connect_status == WLAN_STATUS_SUCCESS) {
bool scan_refresh = false;
u32 i;
memcpy(priv->associated_bss, pstrConnectInfo->bssid, ETH_ALEN);
memcpy(priv->associated_bss, conn_info->bssid, ETH_ALEN);
for (i = 0; i < last_scanned_cnt; i++) {
if (memcmp(last_scanned_shadow[i].bssid,
pstrConnectInfo->bssid,
conn_info->bssid,
ETH_ALEN) == 0) {
unsigned long now = jiffies;
if (time_after(now,
last_scanned_shadow[i].time_scan_cached +
(unsigned long)(nl80211_SCAN_RESULT_EXPIRE - (1 * HZ))))
bNeedScanRefresh = true;
scan_refresh = true;
break;
}
}
if (bNeedScanRefresh)
if (scan_refresh)
refresh_scan(priv, true);
}
cfg80211_connect_result(dev, pstrConnectInfo->bssid,
pstrConnectInfo->req_ies, pstrConnectInfo->req_ies_len,
pstrConnectInfo->resp_ies, pstrConnectInfo->resp_ies_len,
u16ConnectStatus, GFP_KERNEL);
} else if (enuConnDisconnEvent == CONN_DISCONN_EVENT_DISCONN_NOTIF) {
cfg80211_connect_result(dev, conn_info->bssid,
conn_info->req_ies, conn_info->req_ies_len,
conn_info->resp_ies, conn_info->resp_ies_len,
connect_status, GFP_KERNEL);
} else if (conn_disconn_evt == CONN_DISCONN_EVENT_DISCONN_NOTIF) {
wilc_optaining_ip = false;
p2p_local_random = 0x01;
p2p_recv_random = 0x00;
wilc_ie = false;
eth_zero_addr(priv->associated_bss);
wilc_wlan_set_bssid(priv->dev, NullBssid, STATION_MODE);
wilc_wlan_set_bssid(priv->dev, null_bssid, STATION_MODE);
eth_zero_addr(wilc_connected_ssid);
if (!pstrWFIDrv->p2p_connect)
if (!wfi_drv->p2p_connect)
wlan_channel = INVALID_CHANNEL;
if ((pstrWFIDrv->IFC_UP) && (dev == wl->vif[1]->ndev))
pstrDisconnectNotifInfo->reason = 3;
else if ((!pstrWFIDrv->IFC_UP) && (dev == wl->vif[1]->ndev))
pstrDisconnectNotifInfo->reason = 1;
if ((wfi_drv->IFC_UP) && (dev == wl->vif[1]->ndev))
disconn_info->reason = 3;
else if ((!wfi_drv->IFC_UP) && (dev == wl->vif[1]->ndev))
disconn_info->reason = 1;
cfg80211_disconnected(dev, pstrDisconnectNotifInfo->reason, pstrDisconnectNotifInfo->ie,
pstrDisconnectNotifInfo->ie_len, false,
cfg80211_disconnected(dev, disconn_info->reason, disconn_info->ie,
disconn_info->ie_len, false,
GFP_KERNEL);
}
}
@ -794,7 +794,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
ret = wilc_set_join_req(vif, pstrNetworkInfo->bssid, sme->ssid,
sme->ssid_len, sme->ie, sme->ie_len,
CfgConnectResult, (void *)priv,
cfg_connect_result, (void *)priv,
u8security, tenuAuth_type,
pstrNetworkInfo->ch,
pstrNetworkInfo->join_params);