| Message ID | 1518793909-15573-12-git-send-email-ajay.kathat@microchip.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
On 16.02.2018 17:11, Ajay Singh wrote: > Fix "line over 80 characters" issue reported by checkpatch.pl. > Use temporary variable to avoid checkpatch.pl issue. > > Signed-off-by: Ajay Singh <ajay.kathat@microchip.com> > --- > drivers/staging/wilc1000/wilc_wlan.c | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c > index 391ecd5..98cd949 100644 > --- a/drivers/staging/wilc1000/wilc_wlan.c > +++ b/drivers/staging/wilc1000/wilc_wlan.c > @@ -262,10 +262,20 @@ static int wilc_wlan_txq_filter_dup_tcp_ack(struct net_device *dev) > > spin_lock_irqsave(&wilc->txq_spinlock, wilc->txq_spinlock_flags); > for (i = pending_base; i < (pending_base + pending_acks); i++) { > - if (i >= MAX_PENDING_ACKS || > - pending_acks_info[i].session_index >= 2 * MAX_TCP_SESSION) > + u32 session_index; > + u32 bigger_ack_num; > + > + if (i >= MAX_PENDING_ACKS) i >= MAX_PENDINGS_ACKS could be inserted in conditional part of for: for (i = pending_base; i < (pending_base + pending_acks) && i < MAX_PENDINGS_ACKS; i++) or: int maxcnt = (pending_base + pending_acks > MAX_PENDINGS_ACKS) ? pending_base + pending_ack : MAX_PENDINGS_ACKS; for (i = pending_base; i < maxcnt; i++) { // ... } > + break; > + > + session_index = pending_acks_info[i].session_index; > + > + if (session_index >= 2 * MAX_TCP_SESSION) > break; > - if (pending_acks_info[i].ack_num < ack_session_info[pending_acks_info[i].session_index].bigger_ack_num) { > + > + bigger_ack_num = ack_session_info[session_index].bigger_ack_num; > + > + if (pending_acks_info[i].ack_num < bigger_ack_num) { > struct txq_entry_t *tqe; > > tqe = pending_acks_info[i].txqe; >
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 391ecd5..98cd949 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -262,10 +262,20 @@ static int wilc_wlan_txq_filter_dup_tcp_ack(struct net_device *dev) spin_lock_irqsave(&wilc->txq_spinlock, wilc->txq_spinlock_flags); for (i = pending_base; i < (pending_base + pending_acks); i++) { - if (i >= MAX_PENDING_ACKS || - pending_acks_info[i].session_index >= 2 * MAX_TCP_SESSION) + u32 session_index; + u32 bigger_ack_num; + + if (i >= MAX_PENDING_ACKS) + break; + + session_index = pending_acks_info[i].session_index; + + if (session_index >= 2 * MAX_TCP_SESSION) break; - if (pending_acks_info[i].ack_num < ack_session_info[pending_acks_info[i].session_index].bigger_ack_num) { + + bigger_ack_num = ack_session_info[session_index].bigger_ack_num; + + if (pending_acks_info[i].ack_num < bigger_ack_num) { struct txq_entry_t *tqe; tqe = pending_acks_info[i].txqe;
Fix "line over 80 characters" issue reported by checkpatch.pl. Use temporary variable to avoid checkpatch.pl issue. Signed-off-by: Ajay Singh <ajay.kathat@microchip.com> --- drivers/staging/wilc1000/wilc_wlan.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)