[DCCP]: Update code comments for Step 2/3

Sorts out the comments for processing steps 2,3 in section 8.5 of RFC 4340.
All comments have been updated against this document, and the reference to step
2 has been made consistent throughout the files.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>

1 files changed, 18 insertions, 20 deletions

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index d75ce8c7e488..91bffaa761a6 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -729,24 +729,23 @@ int dccp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
 
         /*
          *  Step 3: Process LISTEN state
-         *     If S.state == LISTEN,
-         *        If P.type == Request or P contains a valid Init Cookie
-         *              option,
-         *           * Must scan the packet's options to check for an Init
-         *              Cookie.  Only the Init Cookie is processed here,
-         *              however; other options are processed in Step 8.  This
-         *              scan need only be performed if the endpoint uses Init
-         *              Cookies *
-         *           * Generate a new socket and switch to that socket *
-         *           Set S := new socket for this port pair
-         *           S.state = RESPOND
-         *           Choose S.ISS (initial seqno) or set from Init Cookie
-         *           Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookie
-         *           Continue with S.state == RESPOND
-         *           * A Response packet will be generated in Step 11 *
-         *        Otherwise,
-         *           Generate Reset(No Connection) unless P.type == Reset
-         *           Drop packet and return
+         *       If P.type == Request or P contains a valid Init Cookie option,
+         *            (* Must scan the packet's options to check for Init
+         *               Cookies.  Only Init Cookies are processed here,
+         *               however; other options are processed in Step 8.  This
+         *               scan need only be performed if the endpoint uses Init
+         *               Cookies *)
+         *            (* Generate a new socket and switch to that socket *)
+         *            Set S := new socket for this port pair
+         *            S.state = RESPOND
+         *            Choose S.ISS (initial seqno) or set from Init Cookies
+         *            Initialize S.GAR := S.ISS
+         *            Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookies
+         *            Continue with S.state == RESPOND
+         *            (* A Response packet will be generated in Step 11 *)
+         *       Otherwise,
+         *            Generate Reset(No Connection) unless P.type == Reset
+         *            Drop packet and return
          *
          * NOTE: the check for the packet types is done in
          *       dccp_rcv_state_process
@@ -887,8 +886,6 @@ static int dccp_v4_rcv(struct sk_buff *skb)
         /* 
          * Step 2:
          *      If no socket ...
-         *              Generate Reset(No Connection) unless P.type == Reset
-         *              Drop packet and return
          */
         if (sk == NULL) {
                 dccp_pr_debug("failed to look up flow ID in table and "
@@ -919,6 +916,7 @@ no_dccp_socket:
                 goto discard_it;
         /*
          * Step 2:
+         *      If no socket ...
          *              Generate Reset(No Connection) unless P.type == Reset
          *              Drop packet and return
          */