]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
tcp: (whitespace only) fix confusing indentation
authorAdam Langley <agl@imperialviolet.org>
Fri, 8 Aug 2008 03:27:45 +0000 (20:27 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 8 Aug 2008 03:27:45 +0000 (20:27 -0700)
The indentation in part of tcp_minisocks makes it look like one of the if
statements is much more important than it actually is.

Signed-off-by: Adam Langley <agl@imperialviolet.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_minisocks.c

index 6d286f58c00d20e73904d7bfe610decf65980b44..f976fc57892cf134e22f41255c4b8170f6dd02c9 100644 (file)
@@ -618,89 +618,87 @@ struct sock *tcp_check_req(struct sock *sk,struct sk_buff *skb,
        /* In sequence, PAWS is OK. */
 
        if (tmp_opt.saw_tstamp && !after(TCP_SKB_CB(skb)->seq, tcp_rsk(req)->rcv_isn + 1))
-                       req->ts_recent = tmp_opt.rcv_tsval;
+               req->ts_recent = tmp_opt.rcv_tsval;
 
-               if (TCP_SKB_CB(skb)->seq == tcp_rsk(req)->rcv_isn) {
-                       /* Truncate SYN, it is out of window starting
-                          at tcp_rsk(req)->rcv_isn + 1. */
-                       flg &= ~TCP_FLAG_SYN;
-               }
+       if (TCP_SKB_CB(skb)->seq == tcp_rsk(req)->rcv_isn) {
+               /* Truncate SYN, it is out of window starting
+                  at tcp_rsk(req)->rcv_isn + 1. */
+               flg &= ~TCP_FLAG_SYN;
+       }
 
-               /* RFC793: "second check the RST bit" and
-                *         "fourth, check the SYN bit"
-                */
-               if (flg & (TCP_FLAG_RST|TCP_FLAG_SYN)) {
-                       TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_ATTEMPTFAILS);
-                       goto embryonic_reset;
-               }
+       /* RFC793: "second check the RST bit" and
+        *         "fourth, check the SYN bit"
+        */
+       if (flg & (TCP_FLAG_RST|TCP_FLAG_SYN)) {
+               TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_ATTEMPTFAILS);
+               goto embryonic_reset;
+       }
 
-               /* ACK sequence verified above, just make sure ACK is
-                * set.  If ACK not set, just silently drop the packet.
-                */
-               if (!(flg & TCP_FLAG_ACK))
-                       return NULL;
-
-               /* If TCP_DEFER_ACCEPT is set, drop bare ACK. */
-               if (inet_csk(sk)->icsk_accept_queue.rskq_defer_accept &&
-                   TCP_SKB_CB(skb)->end_seq == tcp_rsk(req)->rcv_isn + 1) {
-                       inet_rsk(req)->acked = 1;
-                       return NULL;
-               }
+       /* ACK sequence verified above, just make sure ACK is
+        * set.  If ACK not set, just silently drop the packet.
+        */
+       if (!(flg & TCP_FLAG_ACK))
+               return NULL;
 
-               /* OK, ACK is valid, create big socket and
-                * feed this segment to it. It will repeat all
-                * the tests. THIS SEGMENT MUST MOVE SOCKET TO
-                * ESTABLISHED STATE. If it will be dropped after
-                * socket is created, wait for troubles.
-                */
-               child = inet_csk(sk)->icsk_af_ops->syn_recv_sock(sk, skb,
-                                                                req, NULL);
-               if (child == NULL)
-                       goto listen_overflow;
+       /* If TCP_DEFER_ACCEPT is set, drop bare ACK. */
+       if (inet_csk(sk)->icsk_accept_queue.rskq_defer_accept &&
+           TCP_SKB_CB(skb)->end_seq == tcp_rsk(req)->rcv_isn + 1) {
+               inet_rsk(req)->acked = 1;
+               return NULL;
+       }
+
+       /* OK, ACK is valid, create big socket and
+        * feed this segment to it. It will repeat all
+        * the tests. THIS SEGMENT MUST MOVE SOCKET TO
+        * ESTABLISHED STATE. If it will be dropped after
+        * socket is created, wait for troubles.
+        */
+       child = inet_csk(sk)->icsk_af_ops->syn_recv_sock(sk, skb, req, NULL);
+       if (child == NULL)
+               goto listen_overflow;
 #ifdef CONFIG_TCP_MD5SIG
-               else {
-                       /* Copy over the MD5 key from the original socket */
-                       struct tcp_md5sig_key *key;
-                       struct tcp_sock *tp = tcp_sk(sk);
-                       key = tp->af_specific->md5_lookup(sk, child);
-                       if (key != NULL) {
-                               /*
-                                * We're using one, so create a matching key on the
-                                * newsk structure. If we fail to get memory then we
-                                * end up not copying the key across. Shucks.
-                                */
-                               char *newkey = kmemdup(key->key, key->keylen,
-                                                      GFP_ATOMIC);
-                               if (newkey) {
-                                       if (!tcp_alloc_md5sig_pool())
-                                               BUG();
-                                       tp->af_specific->md5_add(child, child,
-                                                                newkey,
-                                                                key->keylen);
-                               }
+       else {
+               /* Copy over the MD5 key from the original socket */
+               struct tcp_md5sig_key *key;
+               struct tcp_sock *tp = tcp_sk(sk);
+               key = tp->af_specific->md5_lookup(sk, child);
+               if (key != NULL) {
+                       /*
+                        * We're using one, so create a matching key on the
+                        * newsk structure. If we fail to get memory then we
+                        * end up not copying the key across. Shucks.
+                        */
+                       char *newkey = kmemdup(key->key, key->keylen,
+                                              GFP_ATOMIC);
+                       if (newkey) {
+                               if (!tcp_alloc_md5sig_pool())
+                                       BUG();
+                               tp->af_specific->md5_add(child, child, newkey,
+                                                        key->keylen);
                        }
                }
+       }
 #endif
 
-               inet_csk_reqsk_queue_unlink(sk, req, prev);
-               inet_csk_reqsk_queue_removed(sk, req);
+       inet_csk_reqsk_queue_unlink(sk, req, prev);
+       inet_csk_reqsk_queue_removed(sk, req);
 
-               inet_csk_reqsk_queue_add(sk, req, child);
-               return child;
+       inet_csk_reqsk_queue_add(sk, req, child);
+       return child;
 
-       listen_overflow:
-               if (!sysctl_tcp_abort_on_overflow) {
-                       inet_rsk(req)->acked = 1;
-                       return NULL;
-               }
+listen_overflow:
+       if (!sysctl_tcp_abort_on_overflow) {
+               inet_rsk(req)->acked = 1;
+               return NULL;
+       }
 
-       embryonic_reset:
-               NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
-               if (!(flg & TCP_FLAG_RST))
-                       req->rsk_ops->send_reset(sk, skb);
+embryonic_reset:
+       NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
+       if (!(flg & TCP_FLAG_RST))
+               req->rsk_ops->send_reset(sk, skb);
 
-               inet_csk_reqsk_queue_drop(sk, req, prev);
-               return NULL;
+       inet_csk_reqsk_queue_drop(sk, req, prev);
+       return NULL;
 }
 
 /*