netfilter: conntrack: remove unneeded indent level

After previous patch, the conditional branch is obsolete, reformat it.
gcc generates same code as before this change.

Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index 2d6925e..0574290 100644 (file)
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -663,62 +663,54 @@ tcp_in_window(struct nf_conn *ct, enum ip_conntrack_dir dir,
                return nf_tcp_log_invalid(skb, ct, hook_state, sender, NFCT_TCP_IGNORE,
                                          "ignored ACK under lower bound %u (possible overly delayed)",
                                          receiver->td_end - MAXACKWINDOW(sender) - 1);
-       if (1) {
-               /*
-                * Take into account window scaling (RFC 1323).
-                */
-               if (!tcph->syn)
-                       win <<= sender->td_scale;
-
-               /*
-                * Update sender data.
-                */
-               swin = win + (sack - ack);
-               if (sender->td_maxwin < swin)
-                       sender->td_maxwin = swin;
-               if (after(end, sender->td_end)) {
-                       sender->td_end = end;
-                       sender->flags |= IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED;
-               }
-               if (tcph->ack) {
-                       if (!(sender->flags & IP_CT_TCP_FLAG_MAXACK_SET)) {
-                               sender->td_maxack = ack;
-                               sender->flags |= IP_CT_TCP_FLAG_MAXACK_SET;
-                       } else if (after(ack, sender->td_maxack))
-                               sender->td_maxack = ack;
-               }
 
-               /*
-                * Update receiver data.
-                */
-               if (receiver->td_maxwin != 0 && after(end, sender->td_maxend))
-                       receiver->td_maxwin += end - sender->td_maxend;
-               if (after(sack + win, receiver->td_maxend - 1)) {
-                       receiver->td_maxend = sack + win;
-                       if (win == 0)
-                               receiver->td_maxend++;
+       /* Take into account window scaling (RFC 1323). */
+       if (!tcph->syn)
+               win <<= sender->td_scale;
+
+       /* Update sender data. */
+       swin = win + (sack - ack);
+       if (sender->td_maxwin < swin)
+               sender->td_maxwin = swin;
+       if (after(end, sender->td_end)) {
+               sender->td_end = end;
+               sender->flags |= IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED;
+       }
+       if (tcph->ack) {
+               if (!(sender->flags & IP_CT_TCP_FLAG_MAXACK_SET)) {
+                       sender->td_maxack = ack;
+                       sender->flags |= IP_CT_TCP_FLAG_MAXACK_SET;
+               } else if (after(ack, sender->td_maxack)) {
+                       sender->td_maxack = ack;
                }
-               if (ack == receiver->td_end)
-                       receiver->flags &= ~IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED;
+       }
 
-               /*
-                * Check retransmissions.
-                */
-               if (index == TCP_ACK_SET) {
-                       if (state->last_dir == dir
-                           && state->last_seq == seq
-                           && state->last_ack == ack
-                           && state->last_end == end
-                           && state->last_win == win_raw)
-                               state->retrans++;
-                       else {
-                               state->last_dir = dir;
-                               state->last_seq = seq;
-                               state->last_ack = ack;
-                               state->last_end = end;
-                               state->last_win = win_raw;
-                               state->retrans = 0;
-                       }
+       /* Update receiver data. */
+       if (receiver->td_maxwin != 0 && after(end, sender->td_maxend))
+               receiver->td_maxwin += end - sender->td_maxend;
+       if (after(sack + win, receiver->td_maxend - 1)) {
+               receiver->td_maxend = sack + win;
+               if (win == 0)
+                       receiver->td_maxend++;
+       }
+       if (ack == receiver->td_end)
+               receiver->flags &= ~IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED;
+
+       /* Check retransmissions. */
+       if (index == TCP_ACK_SET) {
+               if (state->last_dir == dir &&
+                   state->last_seq == seq &&
+                   state->last_ack == ack &&
+                   state->last_end == end &&
+                   state->last_win == win_raw) {
+                       state->retrans++;
+               } else {
+                       state->last_dir = dir;
+                       state->last_seq = seq;
+                       state->last_ack = ack;
+                       state->last_end = end;
+                       state->last_win = win_raw;
+                       state->retrans = 0;
                }
        }