staging: wilc1000: fix line over 80 chars in wilc_wlan_txq_filter_dup_tcp_ack()

[linux-2.6-microblaze.git] / drivers / staging / wilc1000 / wilc_wlan.c

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index acaeafc..98cd949 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -173,11 +173,13 @@ static inline int update_tcp_session(u32 index, u32 ack)
 static inline int add_tcp_pending_ack(u32 ack, u32 session_index,
                                      struct txq_entry_t *txqe)
 {
-       if (pending_base + pending_acks < MAX_PENDING_ACKS) {
-               pending_acks_info[pending_base + pending_acks].ack_num = ack;
-               pending_acks_info[pending_base + pending_acks].txqe = txqe;
-               pending_acks_info[pending_base + pending_acks].session_index = session_index;
-               txqe->tcp_pending_ack_idx = pending_base + pending_acks;
+       u32 i = pending_base + pending_acks;
+
+       if (i < MAX_PENDING_ACKS) {
+               pending_acks_info[i].ack_num = ack;
+               pending_acks_info[i].txqe = txqe;
+               pending_acks_info[i].session_index = session_index;
+               txqe->tcp_pending_ack_idx = i;
                pending_acks++;
        }
        return 0;
@@ -230,8 +232,10 @@ static inline void tcp_process(struct net_device *dev, struct txq_entry_t *tqe)
                                         (u32)tcp_hdr_ptr[11];
 
                                for (i = 0; i < tcp_session; i++) {
+                                       u32 j = ack_session_info[i].seq_num;
+
                                        if (i < 2 * MAX_TCP_SESSION &&
-                                           ack_session_info[i].seq_num == seq_no) {
+                                           j == seq_no) {
                                                update_tcp_session(i, ack_no);
                                                break;
                                        }
@@ -258,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;