| Message ID | 1521564944-3565-10-git-send-email-ajay.kathat@microchip.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
On Tue, Mar 20, 2018 at 10:25:42PM +0530, Ajay Singh wrote: > diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c > index 1b6fe64..af1b8aa 100644 > --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c > +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c > @@ -460,6 +460,17 @@ static void cfg_scan_result(enum scan_event scan_event, > } > } > > +static inline bool wilc_wfi_cfg_scan_time_expired(int i) "i" is the wrong parameter to pass. The name is not useful. Probably the right parameter is either &last_scanned_shadow[i] or last_scanned_shadow[i].time_scan_cached. > +{ > + 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; Also I think it you apply this patch and then run checkpatch.pl --strict against the file it will complain that it should be: if (time_after(now, last_scanned_shadow[i].time_scan_cached + (unsigned long)(nl80211_SCAN_RESULT_EXPIRE - (1 * HZ)))) return true; return false; > +} > + > int wilc_connecting; > > static void cfg_connect_result(enum conn_event conn_disconn_evt, > @@ -505,17 +516,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); > It basically always helps me if the "new function" changes are in a patch by themselves. These lines are a pure white space changes and I have a script that reviews those for me instantly, but when it's mixed with this patch I have to do it by hand. regards, dan carpenter
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 1b6fe64..af1b8aa 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -460,6 +460,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, @@ -505,17 +516,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; @@ -527,9 +535,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; @@ -546,9 +556,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); } }
Fix 'line over 80 characters' issues reported by checkpatch.pl script in cfg_connect_result(). Signed-off-by: Ajay Singh <ajay.kathat@microchip.com> --- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 34 +++++++++++++++-------- 1 file changed, 22 insertions(+), 12 deletions(-)