diff options
author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-12-10 13:01:18 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-11 17:35:00 -0500 |
commit | 8109b02b5397ed52a32c116163a62a34f4768b26 (patch) | |
tree | 0dbeae8cc999d2f6b71807b942eda7ff686ba7d2 /net/dccp/ipv4.c | |
parent | 1fba78b6cba14bd37fdb12c5367f1e4d58ff2e0f (diff) |
[DCCP]: 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 <acme@mandriva.com>
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r-- | net/dccp/ipv4.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index ff81679c9f17..90c74b4adb73 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -157,7 +157,7 @@ static inline void dccp_do_pmtu_discovery(struct sock *sk, | |||
157 | /* We don't check in the destentry if pmtu discovery is forbidden | 157 | /* We don't check in the destentry if pmtu discovery is forbidden |
158 | * on this route. We just assume that no packet_to_big packets | 158 | * on this route. We just assume that no packet_to_big packets |
159 | * are send back when pmtu discovery is not active. | 159 | * are send back when pmtu discovery is not active. |
160 | * There is a small race when the user changes this flag in the | 160 | * There is a small race when the user changes this flag in the |
161 | * route, but I think that's acceptable. | 161 | * route, but I think that's acceptable. |
162 | */ | 162 | */ |
163 | if ((dst = __sk_dst_check(sk, 0)) == NULL) | 163 | if ((dst = __sk_dst_check(sk, 0)) == NULL) |
@@ -467,7 +467,7 @@ static struct dst_entry* dccp_v4_route_skb(struct sock *sk, | |||
467 | .uli_u = { .ports = | 467 | .uli_u = { .ports = |
468 | { .sport = dccp_hdr(skb)->dccph_dport, | 468 | { .sport = dccp_hdr(skb)->dccph_dport, |
469 | .dport = dccp_hdr(skb)->dccph_sport } | 469 | .dport = dccp_hdr(skb)->dccph_sport } |
470 | } | 470 | } |
471 | }; | 471 | }; |
472 | 472 | ||
473 | security_skb_classify_flow(skb, &fl); | 473 | security_skb_classify_flow(skb, &fl); |
@@ -595,7 +595,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) | |||
595 | struct inet_request_sock *ireq; | 595 | struct inet_request_sock *ireq; |
596 | struct request_sock *req; | 596 | struct request_sock *req; |
597 | struct dccp_request_sock *dreq; | 597 | struct dccp_request_sock *dreq; |
598 | const __be32 service = dccp_hdr_request(skb)->dccph_req_service; | 598 | const __be32 service = dccp_hdr_request(skb)->dccph_req_service; |
599 | struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb); | 599 | struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb); |
600 | __u8 reset_code = DCCP_RESET_CODE_TOO_BUSY; | 600 | __u8 reset_code = DCCP_RESET_CODE_TOO_BUSY; |
601 | 601 | ||
@@ -609,7 +609,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) | |||
609 | if (dccp_bad_service_code(sk, service)) { | 609 | if (dccp_bad_service_code(sk, service)) { |
610 | reset_code = DCCP_RESET_CODE_BAD_SERVICE_CODE; | 610 | reset_code = DCCP_RESET_CODE_BAD_SERVICE_CODE; |
611 | goto drop; | 611 | goto drop; |
612 | } | 612 | } |
613 | /* | 613 | /* |
614 | * TW buckets are converted to open requests without | 614 | * TW buckets are converted to open requests without |
615 | * limitations, they conserve resources and peer is | 615 | * limitations, they conserve resources and peer is |
@@ -644,7 +644,7 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb) | |||
644 | ireq->rmt_addr = skb->nh.iph->saddr; | 644 | ireq->rmt_addr = skb->nh.iph->saddr; |
645 | ireq->opt = NULL; | 645 | ireq->opt = NULL; |
646 | 646 | ||
647 | /* | 647 | /* |
648 | * Step 3: Process LISTEN state | 648 | * Step 3: Process LISTEN state |
649 | * | 649 | * |
650 | * Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookie | 650 | * 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 *skb) | |||
846 | } | 846 | } |
847 | 847 | ||
848 | /* Step 2: | 848 | /* Step 2: |
849 | * Look up flow ID in table and get corresponding socket */ | 849 | * Look up flow ID in table and get corresponding socket */ |
850 | sk = __inet_lookup(&dccp_hashinfo, | 850 | sk = __inet_lookup(&dccp_hashinfo, |
851 | skb->nh.iph->saddr, dh->dccph_sport, | 851 | skb->nh.iph->saddr, dh->dccph_sport, |
852 | skb->nh.iph->daddr, dh->dccph_dport, | 852 | skb->nh.iph->daddr, dh->dccph_dport, |
853 | inet_iif(skb)); | 853 | inet_iif(skb)); |
854 | 854 | ||
855 | /* | 855 | /* |
856 | * Step 2: | 856 | * Step 2: |
857 | * If no socket ... | 857 | * If no socket ... |
858 | */ | 858 | */ |
859 | if (sk == NULL) { | 859 | if (sk == NULL) { |
860 | dccp_pr_debug("failed to look up flow ID in table and " | 860 | dccp_pr_debug("failed to look up flow ID in table and " |
@@ -862,9 +862,9 @@ static int dccp_v4_rcv(struct sk_buff *skb) | |||
862 | goto no_dccp_socket; | 862 | goto no_dccp_socket; |
863 | } | 863 | } |
864 | 864 | ||
865 | /* | 865 | /* |
866 | * Step 2: | 866 | * Step 2: |
867 | * ... or S.state == TIMEWAIT, | 867 | * ... or S.state == TIMEWAIT, |
868 | * Generate Reset(No Connection) unless P.type == Reset | 868 | * Generate Reset(No Connection) unless P.type == Reset |
869 | * Drop packet and return | 869 | * Drop packet and return |
870 | */ | 870 | */ |
@@ -876,8 +876,8 @@ static int dccp_v4_rcv(struct sk_buff *skb) | |||
876 | 876 | ||
877 | /* | 877 | /* |
878 | * RFC 4340, sec. 9.2.1: Minimum Checksum Coverage | 878 | * RFC 4340, sec. 9.2.1: Minimum Checksum Coverage |
879 | * o if MinCsCov = 0, only packets with CsCov = 0 are accepted | 879 | * o if MinCsCov = 0, only packets with CsCov = 0 are accepted |
880 | * o if MinCsCov > 0, also accept packets with CsCov >= MinCsCov | 880 | * o if MinCsCov > 0, also accept packets with CsCov >= MinCsCov |
881 | */ | 881 | */ |
882 | min_cov = dccp_sk(sk)->dccps_pcrlen; | 882 | min_cov = dccp_sk(sk)->dccps_pcrlen; |
883 | if (dh->dccph_cscov && (min_cov == 0 || dh->dccph_cscov < min_cov)) { | 883 | if (dh->dccph_cscov && (min_cov == 0 || dh->dccph_cscov < min_cov)) { |
@@ -900,7 +900,7 @@ no_dccp_socket: | |||
900 | goto discard_it; | 900 | goto discard_it; |
901 | /* | 901 | /* |
902 | * Step 2: | 902 | * Step 2: |
903 | * If no socket ... | 903 | * If no socket ... |
904 | * Generate Reset(No Connection) unless P.type == Reset | 904 | * Generate Reset(No Connection) unless P.type == Reset |
905 | * Drop packet and return | 905 | * Drop packet and return |
906 | */ | 906 | */ |