: Whitespace cleanups
PATCH 2/2 : Whitespace cleanups
That accumulated over the last months hackaton, shame on me for not using git-apply whitespace helping hand, will do that from now on.
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- include/linux/dccp.h | 26 ++++++----- net/dccp/ackvec.c | 4 +- net/dccp/ccids/ccid2.c | 12 +++-- net/dccp/ccids/ccid3.c | 111 +++++++++++++++++++++++++++--------------------- net/dccp/ccids/ccid3.h | 22 +++++----- net/dccp/feat.c | 6 +-- net/dccp/input.c | 26 ++++++----- net/dccp/ipv4.c | 26 ++++++----- net/dccp/ipv6.c | 24 +++++----- net/dccp/minisocks.c | 2 - net/dccp/output.c | 7 +-- net/dccp/proto.c | 6 +-- net/dccp/timer.c | 14 +++--- 13 files changed, 149 insertions(+), 137 deletions(-)
include/linux/dccp.h +13 -13
@@ -176,20 +176,20 @@ enum { };/* DCCP features (RFC 4340 section 6.4) */ -enum { -DCCPF_RESERVED =0 , -DCCPF_CCID =1 , +enum { +DCCPF_RESERVED =0 , +DCCPF_CCID =1 ,DCCPF_SHORT_SEQNOS =2 ,/* XXX: not yet implemented */ -DCCPF_SEQUENCE_WINDOW =3 , +DCCPF_SEQUENCE_WINDOW =3 ,DCCPF_ECN_INCAPABLE =4 ,/* XXX: not yet implemented */ -DCCPF_ACK_RATIO =5 , -DCCPF_SEND_ACK_VECTOR =6 , -DCCPF_SEND_NDP_COUNT =7 , +DCCPF_ACK_RATIO =5 , +DCCPF_SEND_ACK_VECTOR =6 , +DCCPF_SEND_NDP_COUNT =7 ,DCCPF_MIN_CSUM_COVER =8 ,DCCPF_DATA_CHECKSUM =9 ,/* XXX: not yet implemented */ -/* 10-127 reserved */ -DCCPF_MIN_CCID_SPECIFIC =128 , -DCCPF_MAX_CCID_SPECIFIC =255 , +/* 10-127 reserved */ +DCCPF_MIN_CCID_SPECIFIC =128 , +DCCPF_MAX_CCID_SPECIFIC =255 , };/* this structure is argument to DCCP_SOCKOPT_CHANGE_X */
@@ -427,7 +427,7 @@ struct dccp_service_list { };#define DCCP_SERVICE_INVALID_VALUE htonl((__u32)-1) -#define DCCP_SERVICE_CODE_IS_ABSENT 0 +#define DCCP_SERVICE_CODE_IS_ABSENT 0static inline int dccp_list_has_service (const struct dccp_service_list *sl,const __be32 service)
@@ -436,7 +436,7 @@ static inline int dccp_list_has_service(u32 i = sl->dccpsl_nr;while (i--)if (sl->dccpsl_list[i] = service) -return 1 ; +return 1 ; }return 0 ; }
@@ -511,7 +511,7 @@ struct dccp_sock { __u8 dccps_hc_tx_insert_options:1;struct timer_list dccps_xmit_timer; }; - +static inline struct dccp_sock *dccp_sk (const struct sock *sk) {return (struct dccp_sock *)sk;
net/dccp/ackvec.c +2 -2
@@ -223,7 +223,7 @@ static inline int dccp_ackvec_set_buf_he gap = -new_head; } new_head +=DCCP_MAX_ACKVEC_LEN ; - } + } av->dccpav_buf_head = new_head;
@@ -336,7 +336,7 @@ #ifdef CONFIG_IP_DCCP_DEBUGvoid dccp_ackvector_print (const u64 ackno,const unsigned char *vector,int len) {dccp_pr_debug_cat ("ACK vector len=%d, ackno=%llu |" , len, - (unsigned long long )ackno); + (unsigned long long )ackno);while (len--) {const u8 state = (*vector &DCCP_ACKVEC_STATE_MASK ) >>6 ;
net/dccp/ccids/ccid2.c +6 -6
@@ -351,7 +351,7 @@ #ifdef CONFIG_IP_DCCP_CCID2_DEBUGwhile (seqp != hctx->ccid2hctx_seqh) {ccid2_pr_debug ("out seq=%llu acked=%d time=%lu\n" , - (unsigned long long )seqp->ccid2s_seq, + (unsigned long long )seqp->ccid2s_seq, seqp->ccid2s_acked, seqp->ccid2s_sent); seqp = seqp->ccid2s_next; }
@@ -473,7 +473,7 @@ static inline void ccid2_new_ack(struct/* first measurement */ if (hctx->ccid2hctx_srtt =-1 ) {ccid2_pr_debug ("R: %lu Time=%lu seq=%llu\n" , - r, jiffies, + r, jiffies, (unsigned long long )seqp->ccid2s_seq);ccid2_change_srtt (hctx, r); hctx->ccid2hctx_rttvar = r >>1 ;
@@ -518,8 +518,8 @@ #endif hctx->ccid2hctx_lastrtt = jiffies;ccid2_pr_debug ("srtt: %ld rttvar: %ld rto: %ld (HZ=%d) R=%lu\n" , - hctx->ccid2hctx_srtt, hctx->ccid2hctx_rttvar, - hctx->ccid2hctx_rto,HZ , r); + hctx->ccid2hctx_srtt, hctx->ccid2hctx_rttvar, + hctx->ccid2hctx_rto,HZ , r); hctx->ccid2hctx_sent =0 ; }
@@ -667,9 +667,9 @@ static void ccid2_hc_tx_packet_recv(stru/* new packet received or marked */ if (state !=DCCP_ACKVEC_STATE_NOT_RECEIVED && !seqp->ccid2s_acked) { -if (state = +if (state =DCCP_ACKVEC_STATE_ECN_MARKED ) { -ccid2_congestion_event (hctx, +ccid2_congestion_event (hctx, seqp); }else ccid2_new_ack(sk, seqp,
net/dccp/ccids/ccid3.c +58 -49
317 lines not on this page · raw message
net/dccp/ccids/ccid3.h +11 -11
@@ -77,7 +77,7 @@ struct ccid3_options_received {/* TFRC sender states */ enum ccid3_hc_tx_states { -TFRC_SSTATE_NO_SENT =1 , +TFRC_SSTATE_NO_SENT =1 ,TFRC_SSTATE_NO_FBACK ,TFRC_SSTATE_FBACK ,TFRC_SSTATE_TERM ,
@@ -96,7 +96,7 @@ enum ccid3_hc_tx_states {* @ccid3hctx_state - Sender state, one of %ccid3_hc_tx_states * @ccid3hctx_last_win_count - Last window counter sent * @ccid3hctx_t_last_win_count - Timestamp of earliest packet -* with last_win_count value sent +* with last_win_count value sent * @ccid3hctx_no_feedback_timer - Handle to no feedback timer * @ccid3hctx_idle - Flag indicating that sender is idling * @ccid3hctx_t_ld - Time last doubled during slow start
@@ -115,7 +115,7 @@ #define ccid3hctx_p ccid3hctx_tfrc.tfr#define ccid3hctx_t_rto ccid3hctx_tfrc.tfrctx_rto#define ccid3hctx_t_ipi ccid3hctx_tfrc.tfrctx_ipiu16 ccid3hctx_s; - enum ccid3_hc_tx_states ccid3hctx_state:8; + enum ccid3_hc_tx_states ccid3hctx_state:8;u8 ccid3hctx_last_win_count;u8 ccid3hctx_idle;struct timeval ccid3hctx_t_last_win_count;
@@ -129,7 +129,7 @@ #define ccid3hctx_t_ipi ccid3hctx_tfrc/* TFRC receiver states */ enum ccid3_hc_rx_states { -TFRC_RSTATE_NO_DATA =1 , +TFRC_RSTATE_NO_DATA =1 ,TFRC_RSTATE_DATA ,TFRC_RSTATE_TERM =127 , };
@@ -157,18 +157,18 @@ struct ccid3_hc_rx_sock {#define ccid3hcrx_x_recv ccid3hcrx_tfrc.tfrcrx_x_recv#define ccid3hcrx_rtt ccid3hcrx_tfrc.tfrcrx_rtt#define ccid3hcrx_p ccid3hcrx_tfrc.tfrcrx_p - u64 ccid3hcrx_seqno_nonloss:48, + u64 ccid3hcrx_seqno_nonloss:48, ccid3hcrx_ccval_nonloss:4, ccid3hcrx_ccval_last_counter:4; enum ccid3_hc_rx_states ccid3hcrx_state:8; -u32 ccid3hcrx_bytes_recv; -struct timeval ccid3hcrx_tstamp_last_feedback; -struct timeval ccid3hcrx_tstamp_last_ack; +u32 ccid3hcrx_bytes_recv; +struct timeval ccid3hcrx_tstamp_last_feedback; +struct timeval ccid3hcrx_tstamp_last_ack;struct list_head ccid3hcrx_hist;struct list_head ccid3hcrx_li_hist; -u16 ccid3hcrx_s; -u32 ccid3hcrx_pinv; -u32 ccid3hcrx_elapsed_time; +u16 ccid3hcrx_s; +u32 ccid3hcrx_pinv; +u32 ccid3hcrx_elapsed_time; };static inline struct ccid3_hc_tx_sock *ccid3_hc_tx_sk (const struct sock *sk)
net/dccp/feat.c +3 -3
@@ -329,7 +329,7 @@ static void dccp_feat_empty_confirm(struswitch (type) {case DCCPO_CHANGE_L : opt->dccpop_type =DCCPO_CONFIRM_R ;break ;case DCCPO_CHANGE_R : opt->dccpop_type =DCCPO_CONFIRM_L ;break ; -default :DCCP_WARN ("invalid type %d\n" , type);return ; +default :DCCP_WARN ("invalid type %d\n" , type);return ; } opt->dccpop_feat = feature;
@@ -427,7 +427,7 @@ int dccp_feat_confirm_recv(struct sock *switch (type) {case DCCPO_CONFIRM_L : t =DCCPO_CHANGE_R ;break ;case DCCPO_CONFIRM_R : t =DCCPO_CHANGE_L ;break ; -default :DCCP_WARN ("invalid type %d\n" , type); +default :DCCP_WARN ("invalid type %d\n" , type);return 1 ; }
@@ -610,7 +610,7 @@ const char *dccp_feat_typename(const u8case DCCPO_CHANGE_R :return ("ChangeR" );case DCCPO_CONFIRM_R :return ("ConfirmR" );/* the following case must not appear in feature negotation */ -default :dccp_pr_debug ("unknown type %d [BUG!]\n" , type); +default :dccp_pr_debug ("unknown type %d [BUG!]\n" , type); }return NULL ; }
net/dccp/input.c +13 -13
@@ -1,6 +1,6 @@/* * net/dccp/input.c -* +* * An implementation of the DCCP protocol * Arnaldo Carvalho de Melo <[email protected]> *
@@ -82,7 +82,7 @@ static int dccp_check_seqno(struct sock* Otherwise, * Drop packet and return */ -if (dh->dccph_type =DCCP_PKT_SYNC || +if (dh->dccph_type =DCCP_PKT_SYNC || dh->dccph_type =DCCP_PKT_SYNCACK ) { if (between48(DCCP_SKB_CB(skb)->dccpd_ack_seq, dp->dccps_awl, dp->dccps_awh) &&
@@ -185,8 +185,8 @@ static int __dccp_rcv_established(structdccp_rcv_close (sk, skb);return 0 ;case DCCP_PKT_REQUEST : -/* Step 7 -* or (S.is_server and P.type = Response) +/* Step 7 +* or (S.is_server and P.type = Response) * or (S.is_client and P.type = Request) * or (S.state >= OPEN and P.type = Request * and P.seqno >= S.OSR)
@@ -274,7 +274,7 @@ static int dccp_rcv_request_sent_state_pconst struct dccp_hdr *dh, const unsigned len) { -/* +/* * Step 4: Prepare sequence numbers in REQUEST * If S.state = REQUEST, * If (P.type = Response or P.type = Reset)
@@ -342,7 +342,7 @@ static int dccp_rcv_request_sent_state_p* from the Response * / * S.state := PARTOPEN * Set PARTOPEN timer -* Continue with S.state = PARTOPEN +* Continue with S.state = PARTOPEN * / * Step 12 will send the Ack completing the * three-way handshake * / */
@@ -373,7 +373,7 @@ static int dccp_rcv_request_sent_state_p*/ __kfree_skb (skb);return 0 ; - } + }dccp_send_ack (sk);return -1 ; }
@@ -381,7 +381,7 @@ static int dccp_rcv_request_sent_state_p out_invalid_packet:/* dccp_v4_do_rcv will send a reset */ DCCP_SKB_CB (skb)->dccpd_reset_code =DCCP_RESET_CODE_PACKET_ERROR ; -return 1 ; +return 1 ; } static int dccp_rcv_respond_partopen_state_process(struct sock *sk,
@@ -488,11 +488,11 @@ int dccp_rcv_state_process(struct sock *if (dcb->dccpd_ack_seq !=DCCP_PKT_WITHOUT_ACK_SEQ )dccp_event_ack_recv (sk, skb); -if (dccp_msk (sk)->dccpms_send_ack_vector && +if (dccp_msk (sk)->dccpms_send_ack_vector &&dccp_ackvec_add (dp->dccps_hc_rx_ackvec, sk, -DCCP_SKB_CB (skb)->dccpd_seq, -DCCP_ACKVEC_STATE_RECEIVED )) - goto discard; +DCCP_SKB_CB (skb)->dccpd_seq, +DCCP_ACKVEC_STATE_RECEIVED )) + goto discard;/* XXX see the comments in dccp_rcv_established about this */ if (dccp_sk (sk)->dccps_role =DCCP_ROLE_SERVER )
@@ -580,7 +580,7 @@ int dccp_rcv_state_process(struct sock * } } -if (!queued) { +if (!queued) { discard:__kfree_skb (skb); }
net/dccp/ipv4.c +13 -13
@@ -157,7 +157,7 @@ static inline void dccp_do_pmtu_discover/* We don't check in the destentry if pmtu discovery is forbidden * on this route. We just assume that no packet_to_big packets * are send back when pmtu discovery is not active. -* There is a small race when the user changes this flag in the +* There is a small race when the user changes this flag in the * route, but I think that's acceptable. */ if ((dst =__sk_dst_check (sk,0 )) =NULL )
@@ -467,7 +467,7 @@ static struct dst_entry* dccp_v4_route_s .uli_u = { .ports { .sport = dccp_hdr(skb)->dccph_dport, .dport = dccp_hdr(skb)->dccph_sport } - } + } };security_skb_classify_flow (skb, &fl);
@@ -595,7 +595,7 @@ int dccp_v4_conn_request(struct sock *skstruct inet_request_sock *ireq;struct request_sock *req;struct dccp_request_sock *dreq; -const __be32 service =dccp_hdr_request (skb)->dccph_req_service; +const __be32 service =dccp_hdr_request (skb)->dccph_req_service;struct dccp_skb_cb *dcb =DCCP_SKB_CB (skb);__u8 reset_code =DCCP_RESET_CODE_TOO_BUSY ;
@@ -609,7 +609,7 @@ int dccp_v4_conn_request(struct sock *skif (dccp_bad_service_code (sk, service)) { reset_code =DCCP_RESET_CODE_BAD_SERVICE_CODE ; goto drop; - } + }/* * TW buckets are converted to open requests without * limitations, they conserve resources and peer is
@@ -644,7 +644,7 @@ int dccp_v4_conn_request(struct sock *sk ireq->rmt_addr = skb->nh.iph->saddr; ireq->opt =NULL ; -/* +/* * Step 3: Process LISTEN state * * Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookie
@@ -846,15 +846,15 @@ static int dccp_v4_rcv(struct sk_buff *s }/* Step 2: -* Look up flow ID in table and get corresponding socket */ +* Look up flow ID in table and get corresponding socket */ sk =__inet_lookup (&dccp_hashinfo, skb->nh.iph->saddr, dh->dccph_sport, skb->nh.iph->daddr, dh->dccph_dport,inet_iif (skb)); -/* +/* * Step 2: -* If no socket ... +* If no socket ... */ if (sk =NULL ) { dccp_pr_debug("failed to look up flow ID in table and "
@@ -862,9 +862,9 @@ static int dccp_v4_rcv(struct sk_buff *s goto no_dccp_socket; } -/* +/* * Step 2: -* ... or S.state = TIMEWAIT, +* ... or S.state = TIMEWAIT, * Generate Reset(No Connection) unless P.type = Reset * Drop packet and return */
@@ -876,8 +876,8 @@ static int dccp_v4_rcv(struct sk_buff *s/* * RFC 4340, sec. 9.2.1: Minimum Checksum Coverage -* o if MinCsCov = 0, only packets with CsCov = 0 are accepted -* o if MinCsCov > 0, also accept packets with CsCov >= MinCsCov +* o if MinCsCov = 0, only packets with CsCov = 0 are accepted +* o if MinCsCov > 0, also accept packets with CsCov >= MinCsCov */ min_cov =dccp_sk (sk)->dccps_pcrlen;if (dh->dccph_cscov && (min_cov =0 || dh->dccph_cscov < min_cov)) {
@@ -900,7 +900,7 @@ no_dccp_socket: goto discard_it;/* * Step 2: -* If no socket ... +* If no socket ... * Generate Reset(No Connection) unless P.type = Reset * Drop packet and return */
net/dccp/ipv6.c +12 -12
@@ -77,7 +77,7 @@ static inline void dccp_v6_send_check(st }static inline __u32 secure_dccpv6_sequence_number (__be32 *saddr,__be32 *daddr, -__be16 sport,__be16 dport ) +__be16 sport,__be16 dport ) {return secure_tcpv6_sequence_number (saddr, daddr, sport, dport); }
@@ -329,7 +329,7 @@ static void dccp_v6_ctl_send_reset(struc skb =alloc_skb (dccp_v6_ctl_socket->sk->sk_prot->max_header,GFP_ATOMIC );if (skb =NULL ) -return ; +return ;skb_reserve (skb, dccp_v6_ctl_socket->sk->sk_prot->max_header);
@@ -353,7 +353,7 @@ static void dccp_v6_ctl_send_reset(strucdccp_csum_outgoing (skb); dh->dccph_checksum =dccp_v6_csum_finish (skb, &rxskb->nh.ipv6h->saddr, - &rxskb->nh.ipv6h->daddr); + &rxskb->nh.ipv6h->daddr);memset (&fl,0 ,sizeof (fl));ipv6_addr_copy (&fl.fl6_dst, &rxskb->nh.ipv6h->saddr);
@@ -424,7 +424,7 @@ static int dccp_v6_conn_request(struct sstruct dccp_request_sock *dreq;struct inet6_request_sock *ireq6;struct ipv6_pinfo *np =inet6_sk (sk); -const __be32 service =dccp_hdr_request (skb)->dccph_req_service; +const __be32 service =dccp_hdr_request (skb)->dccph_req_service;struct dccp_skb_cb *dcb =DCCP_SKB_CB (skb);__u8 reset_code =DCCP_RESET_CODE_TOO_BUSY ;
@@ -437,7 +437,7 @@ static int dccp_v6_conn_request(struct sif (dccp_bad_service_code (sk, service)) { reset_code =DCCP_RESET_CODE_BAD_SERVICE_CODE ; goto drop; - } + }/* * There are no SYN attacks on IPv6, yet... */
@@ -787,7 +787,7 @@ static int dccp_v6_do_rcv(struct sock *s* otherwise we just shortcircuit this and continue with * the new socket.. */ -if (nsk != sk) { +if (nsk != sk) {if (dccp_child_process (sk, nsk, skb)) goto reset;if (opt_skb !=NULL )
@@ -843,14 +843,14 @@ static int dccp_v6_rcv(struct sk_buff **DCCP_SKB_CB (skb)->dccpd_ack_seq =dccp_hdr_ack_seq (skb);/* Step 2: -* Look up flow ID in table and get corresponding socket */ +* Look up flow ID in table and get corresponding socket */ sk =__inet6_lookup (&dccp_hashinfo, &skb->nh.ipv6h->saddr, dh->dccph_sport, &skb->nh.ipv6h->daddr,ntohs (dh->dccph_dport),inet6_iif (skb));/* * Step 2: -* If no socket ... +* If no socket ... */ if (sk =NULL ) { dccp_pr_debug("failed to look up flow ID in table and "
@@ -860,7 +860,7 @@ static int dccp_v6_rcv(struct sk_buff **/* * Step 2: -* ... or S.state = TIMEWAIT, +* ... or S.state = TIMEWAIT, * Generate Reset(No Connection) unless P.type = Reset * Drop packet and return */
@@ -872,8 +872,8 @@ static int dccp_v6_rcv(struct sk_buff **/* * RFC 4340, sec. 9.2.1: Minimum Checksum Coverage -* o if MinCsCov = 0, only packets with CsCov = 0 are accepted -* o if MinCsCov > 0, also accept packets with CsCov >= MinCsCov +* o if MinCsCov = 0, only packets with CsCov = 0 are accepted +* o if MinCsCov > 0, also accept packets with CsCov >= MinCsCov */ min_cov =dccp_sk (sk)->dccps_pcrlen;if (dh->dccph_cscov && (min_cov =0 || dh->dccph_cscov < min_cov)) {
@@ -893,7 +893,7 @@ no_dccp_socket: goto discard_it;/* * Step 2: -* If no socket ... +* If no socket ... * Generate Reset(No Connection) unless P.type = Reset * Drop packet and return */
net/dccp/minisocks.c +1 -1
@@ -182,7 +182,7 @@ out_free:EXPORT_SYMBOL_GPL (dccp_create_openreq_child); -/* +/* * Process an incoming packet for RESPOND sockets represented * as an request_sock. */
net/dccp/output.c +3 -4
@@ -1,6 +1,6 @@/* * net/dccp/output.c -* +* * An implementation of the DCCP protocol * Arnaldo Carvalho de Melo <[email protected]> *
@@ -338,7 +338,6 @@ EXPORT_SYMBOL_GPL(dccp_make_response);static struct sk_buff *dccp_make_reset (struct sock *sk,struct dst_entry *dst,const enum dccp_reset_codes code) - {struct dccp_hdr *dh;struct dccp_sock *dp =dccp_sk (sk);
@@ -419,14 +418,14 @@ static inline void dccp_connect_init(strdccp_sync_mss (sk,dst_mtu (dst)); -/* +/* * SWL and AWL are initially adjusted so that they are not less than * the initial Sequence Numbers received and sent, respectively: * SWL := max(GSR + 1 - floor(W/4), ISR), * AWL := max(GSS - W' + 1, ISS). * These adjustments MUST be applied only at the beginning of the * connection. -*/ +*/ dccp_update_gss (sk, dp->dccps_iss);dccp_set_seqno (&dp->dccps_awl,max48 (dp->dccps_awl, dp->dccps_iss));
net/dccp/proto.c +3 -3
@@ -196,7 +196,7 @@ int dccp_init_sock(struct sock *sk, cons sk, GFP_KERNEL); dp->dccps_hc_tx_ccid =ccid_hc_tx_new (dmsk->dccpms_tx_ccid, sk,GFP_KERNEL ); -if (unlikely (dp->dccps_hc_rx_ccid =NULL || +if (unlikely (dp->dccps_hc_rx_ccid =NULL || dp->dccps_hc_tx_ccid =NULL )) {ccid_hc_rx_delete (dp->dccps_hc_rx_ccid, sk);ccid_hc_tx_delete (dp->dccps_hc_tx_ccid, sk);
@@ -390,7 +390,7 @@ static int dccp_setsockopt_service(strucstruct dccp_sock *dp =dccp_sk (sk);struct dccp_service_list *sl =NULL ; -if (service =DCCP_SERVICE_INVALID_VALUE || +if (service =DCCP_SERVICE_INVALID_VALUE || optlen >DCCP_SERVICE_LIST_MAX_LEN *sizeof (u32))return -EINVAL ;
@@ -830,7 +830,7 @@ EXPORT_SYMBOL_GPL(inet_dccp_listen);static const unsigned char dccp_new_state[] = {/* current state: new state: action: */ [0 ] =DCCP_CLOSED , - [DCCP_OPEN ] =DCCP_CLOSING |DCCP_ACTION_FIN , + [DCCP_OPEN ] =DCCP_CLOSING |DCCP_ACTION_FIN , [DCCP_REQUESTING ] =DCCP_CLOSED , [DCCP_PARTOPEN ] =DCCP_CLOSING |DCCP_ACTION_FIN , [DCCP_LISTEN ] =DCCP_CLOSED ,
net/dccp/timer.c +7 -7
@@ -1,6 +1,6 @@/* * net/dccp/timer.c -* +* * An implementation of the DCCP protocol * Arnaldo Carvalho de Melo <[email protected]> *
@@ -102,13 +102,13 @@ static void dccp_retransmit_timer(struct* sk->sk_send_head has to have one skb with * DCCP_SKB_CB(skb)->dccpd_type set to one of the retransmittable DCCP * packet types. The only packets eligible for retransmission are: -* -- Requests in client-REQUEST state (sec. 8.1.1) -* -- Acks in client-PARTOPEN state (sec. 8.1.5) -* -- CloseReq in server-CLOSEREQ state (sec. 8.3) -* -- Close in node-CLOSING state (sec. 8.3) */ +* -- Requests in client-REQUEST state (sec. 8.1.1) +* -- Acks in client-PARTOPEN state (sec. 8.1.5) +* -- CloseReq in server-CLOSEREQ state (sec. 8.3) +* -- Close in node-CLOSING state (sec. 8.3) */ BUG_TRAP (sk->sk_send_head !=NULL ); -/* +/* * More than than 4MSL (8 minutes) has passed, a RESET(aborted) was * sent, no need to retransmit, this sock is dead. */
@@ -200,7 +200,7 @@ static void dccp_keepalive_timer(unsigne/* Only process if socket is not in use. */ bh_lock_sock (sk);if (sock_owned_by_user (sk)) { -/* Try again later. */ +/* Try again later. */ inet_csk_reset_keepalive_timer (sk,HZ /20 ); goto out; }
Signature · 1 line
1.4.2.1.g3d5c