Commit b79e5a89 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman

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

Fix 'line over 80 characters' issues reported by checkpatch.pl script in
cfg_connect_result().
Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b7a86d65
...@@ -459,6 +459,17 @@ static void cfg_scan_result(enum scan_event scan_event, ...@@ -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; int wilc_connecting;
static void cfg_connect_result(enum conn_event conn_disconn_evt, 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, ...@@ -504,17 +515,14 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt,
bool scan_refresh = false; bool scan_refresh = false;
u32 i; 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++) { for (i = 0; i < last_scanned_cnt; i++) {
if (memcmp(last_scanned_shadow[i].bssid, if (memcmp(last_scanned_shadow[i].bssid,
conn_info->bssid, conn_info->bssid,
ETH_ALEN) == 0) { ETH_ALEN) == 0) {
unsigned long now = jiffies; if (wilc_wfi_cfg_scan_time_expired(i))
if (time_after(now,
last_scanned_shadow[i].time_scan_cached +
(unsigned long)(nl80211_SCAN_RESULT_EXPIRE - (1 * HZ))))
scan_refresh = true; scan_refresh = true;
break; break;
...@@ -526,9 +534,11 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt, ...@@ -526,9 +534,11 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt,
} }
cfg80211_connect_result(dev, conn_info->bssid, cfg80211_connect_result(dev, conn_info->bssid,
conn_info->req_ies, conn_info->req_ies_len, conn_info->req_ies,
conn_info->resp_ies, conn_info->resp_ies_len, conn_info->req_ies_len,
connect_status, GFP_KERNEL); conn_info->resp_ies,
conn_info->resp_ies_len, connect_status,
GFP_KERNEL);
} else if (conn_disconn_evt == CONN_DISCONN_EVENT_DISCONN_NOTIF) { } else if (conn_disconn_evt == CONN_DISCONN_EVENT_DISCONN_NOTIF) {
wilc_optaining_ip = false; wilc_optaining_ip = false;
p2p_local_random = 0x01; p2p_local_random = 0x01;
...@@ -545,9 +555,9 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt, ...@@ -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) else if (!wfi_drv->IFC_UP && dev == wl->vif[1]->ndev)
disconn_info->reason = 1; disconn_info->reason = 1;
cfg80211_disconnected(dev, disconn_info->reason, disconn_info->ie, cfg80211_disconnected(dev, disconn_info->reason,
disconn_info->ie_len, false, disconn_info->ie, disconn_info->ie_len,
GFP_KERNEL); false, GFP_KERNEL);
} }
} }
......
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