mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-25 11:55:37 +00:00
Code Issues Releases Wiki Activity

staging: wilc1000: remove line over 80 char in cfg_connect_result()

Browse source 
Fix 'line over 80 characters' issues reported by checkpatch.pl script in
cfg_connect_result().

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ajay Singh 2018-04-23 22:03:11 +05:30 committed by Greg Kroah-Hartman
parent b7a86d650c
commit b79e5a89c2
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View file

@ -459,6 +459,17 @@ static void cfg_scan_result(enum scan_event scan_event,
}
}
static inline bool wilc_wfi_cfg_scan_time_expired(int i)
{
unsigned long now = jiffies;
if (time_after(now, last_scanned_shadow[i].time_scan_cached +
(unsigned long)(nl80211_SCAN_RESULT_EXPIRE - (1 * HZ))))
return true;
else
return false;
}
int wilc_connecting;
static void cfg_connect_result(enum conn_event conn_disconn_evt,
@ -504,17 +515,14 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt,
bool scan_refresh = false;
u32 i;
memcpy(priv->associated_bss, conn_info->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,
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))))
if (wilc_wfi_cfg_scan_time_expired(i))
scan_refresh = true;
break;
@ -526,9 +534,11 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt,
}
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);
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;
@ -545,9 +555,9 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt,
else if (!wfi_drv->IFC_UP && dev == wl->vif[1]->ndev)
disconn_info->reason = 1;
cfg80211_disconnected(dev, disconn_info->reason, disconn_info->ie,
disconn_info->ie_len, false,
GFP_KERNEL);
cfg80211_disconnected(dev, disconn_info->reason,
disconn_info->ie, disconn_info->ie_len,
false, GFP_KERNEL);
}
}