• Gerrit Renker's avatar
    dccp ccid-2: Simplify dec_pipe and rearming of RTO timer · c38c92a8
    Gerrit Renker authored
    This removes the dec_pipe function and improves the way the RTO timer is rearmed
    when a new acknowledgment comes in.
    
    Details and justification for removal:
    --------------------------------------
     1) The BUG_ON in dec_pipe is never triggered: pipe is only decremented for TX
        history entries between tail and head, for which it had previously been
        incremented in tx_packet_sent; and it is not decremented twice for the same
        entry, since it is
        - either decremented when a corresponding Ack Vector cell in state 0 or 1
          was received (and then ccid2s_acked==1),
        - or it is decremented when ccid2s_acked==0, as part of the loss detection
          in tx_packet_recv (and hence it can not have been decremented earlier).
    
     2) Restarting the RTO timer happens for every single entry in each Ack Vector
        parsed by tx_packet_recv (according to RFC 4340, 11.4 this can happen up to
        16192 times per Ack Vector).
    
     3) The RTO timer should not be restarted when all outstanding data has been
        acknowledged. This is currently done similar to (2), in dec_pipe, when
        pipe has reached 0.
    
    The patch onsolidates the code which rearms the RTO timer, combining the
    segments from new_ack and dec_pipe. As a result, the code becomes clearer
    (compare with tcp_rearm_rto()).
    Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    c38c92a8
ccid2.c 18.5 KB