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/ipv6.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/ipv6.c')
-rw-r--r-- | net/dccp/ipv6.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index c7aaa2574f52..6b91a9dd0411 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -77,7 +77,7 @@ static inline void dccp_v6_send_check(struct sock *sk, int unused_value, | |||
77 | } | 77 | } |
78 | 78 | ||
79 | static inline __u32 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr, | 79 | static inline __u32 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr, |
80 | __be16 sport, __be16 dport ) | 80 | __be16 sport, __be16 dport ) |
81 | { | 81 | { |
82 | return secure_tcpv6_sequence_number(saddr, daddr, sport, dport); | 82 | return secure_tcpv6_sequence_number(saddr, daddr, sport, dport); |
83 | } | 83 | } |
@@ -329,7 +329,7 @@ static void dccp_v6_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) | |||
329 | skb = alloc_skb(dccp_v6_ctl_socket->sk->sk_prot->max_header, | 329 | skb = alloc_skb(dccp_v6_ctl_socket->sk->sk_prot->max_header, |
330 | GFP_ATOMIC); | 330 | GFP_ATOMIC); |
331 | if (skb == NULL) | 331 | if (skb == NULL) |
332 | return; | 332 | return; |
333 | 333 | ||
334 | skb_reserve(skb, dccp_v6_ctl_socket->sk->sk_prot->max_header); | 334 | skb_reserve(skb, dccp_v6_ctl_socket->sk->sk_prot->max_header); |
335 | 335 | ||
@@ -353,7 +353,7 @@ static void dccp_v6_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) | |||
353 | 353 | ||
354 | dccp_csum_outgoing(skb); | 354 | dccp_csum_outgoing(skb); |
355 | dh->dccph_checksum = dccp_v6_csum_finish(skb, &rxskb->nh.ipv6h->saddr, | 355 | dh->dccph_checksum = dccp_v6_csum_finish(skb, &rxskb->nh.ipv6h->saddr, |
356 | &rxskb->nh.ipv6h->daddr); | 356 | &rxskb->nh.ipv6h->daddr); |
357 | 357 | ||
358 | memset(&fl, 0, sizeof(fl)); | 358 | memset(&fl, 0, sizeof(fl)); |
359 | ipv6_addr_copy(&fl.fl6_dst, &rxskb->nh.ipv6h->saddr); | 359 | ipv6_addr_copy(&fl.fl6_dst, &rxskb->nh.ipv6h->saddr); |
@@ -424,7 +424,7 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) | |||
424 | struct dccp_request_sock *dreq; | 424 | struct dccp_request_sock *dreq; |
425 | struct inet6_request_sock *ireq6; | 425 | struct inet6_request_sock *ireq6; |
426 | struct ipv6_pinfo *np = inet6_sk(sk); | 426 | struct ipv6_pinfo *np = inet6_sk(sk); |
427 | const __be32 service = dccp_hdr_request(skb)->dccph_req_service; | 427 | const __be32 service = dccp_hdr_request(skb)->dccph_req_service; |
428 | struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb); | 428 | struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb); |
429 | __u8 reset_code = DCCP_RESET_CODE_TOO_BUSY; | 429 | __u8 reset_code = DCCP_RESET_CODE_TOO_BUSY; |
430 | 430 | ||
@@ -437,7 +437,7 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) | |||
437 | if (dccp_bad_service_code(sk, service)) { | 437 | if (dccp_bad_service_code(sk, service)) { |
438 | reset_code = DCCP_RESET_CODE_BAD_SERVICE_CODE; | 438 | reset_code = DCCP_RESET_CODE_BAD_SERVICE_CODE; |
439 | goto drop; | 439 | goto drop; |
440 | } | 440 | } |
441 | /* | 441 | /* |
442 | * There are no SYN attacks on IPv6, yet... | 442 | * There are no SYN attacks on IPv6, yet... |
443 | */ | 443 | */ |
@@ -787,7 +787,7 @@ static int dccp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) | |||
787 | * otherwise we just shortcircuit this and continue with | 787 | * otherwise we just shortcircuit this and continue with |
788 | * the new socket.. | 788 | * the new socket.. |
789 | */ | 789 | */ |
790 | if (nsk != sk) { | 790 | if (nsk != sk) { |
791 | if (dccp_child_process(sk, nsk, skb)) | 791 | if (dccp_child_process(sk, nsk, skb)) |
792 | goto reset; | 792 | goto reset; |
793 | if (opt_skb != NULL) | 793 | if (opt_skb != NULL) |
@@ -843,14 +843,14 @@ static int dccp_v6_rcv(struct sk_buff **pskb) | |||
843 | DCCP_SKB_CB(skb)->dccpd_ack_seq = dccp_hdr_ack_seq(skb); | 843 | DCCP_SKB_CB(skb)->dccpd_ack_seq = dccp_hdr_ack_seq(skb); |
844 | 844 | ||
845 | /* Step 2: | 845 | /* Step 2: |
846 | * Look up flow ID in table and get corresponding socket */ | 846 | * Look up flow ID in table and get corresponding socket */ |
847 | sk = __inet6_lookup(&dccp_hashinfo, &skb->nh.ipv6h->saddr, | 847 | sk = __inet6_lookup(&dccp_hashinfo, &skb->nh.ipv6h->saddr, |
848 | dh->dccph_sport, | 848 | dh->dccph_sport, |
849 | &skb->nh.ipv6h->daddr, ntohs(dh->dccph_dport), | 849 | &skb->nh.ipv6h->daddr, ntohs(dh->dccph_dport), |
850 | inet6_iif(skb)); | 850 | inet6_iif(skb)); |
851 | /* | 851 | /* |
852 | * Step 2: | 852 | * Step 2: |
853 | * If no socket ... | 853 | * If no socket ... |
854 | */ | 854 | */ |
855 | if (sk == NULL) { | 855 | if (sk == NULL) { |
856 | dccp_pr_debug("failed to look up flow ID in table and " | 856 | dccp_pr_debug("failed to look up flow ID in table and " |
@@ -860,7 +860,7 @@ static int dccp_v6_rcv(struct sk_buff **pskb) | |||
860 | 860 | ||
861 | /* | 861 | /* |
862 | * Step 2: | 862 | * Step 2: |
863 | * ... or S.state == TIMEWAIT, | 863 | * ... or S.state == TIMEWAIT, |
864 | * Generate Reset(No Connection) unless P.type == Reset | 864 | * Generate Reset(No Connection) unless P.type == Reset |
865 | * Drop packet and return | 865 | * Drop packet and return |
866 | */ | 866 | */ |
@@ -872,8 +872,8 @@ static int dccp_v6_rcv(struct sk_buff **pskb) | |||
872 | 872 | ||
873 | /* | 873 | /* |
874 | * RFC 4340, sec. 9.2.1: Minimum Checksum Coverage | 874 | * RFC 4340, sec. 9.2.1: Minimum Checksum Coverage |
875 | * o if MinCsCov = 0, only packets with CsCov = 0 are accepted | 875 | * o if MinCsCov = 0, only packets with CsCov = 0 are accepted |
876 | * o if MinCsCov > 0, also accept packets with CsCov >= MinCsCov | 876 | * o if MinCsCov > 0, also accept packets with CsCov >= MinCsCov |
877 | */ | 877 | */ |
878 | min_cov = dccp_sk(sk)->dccps_pcrlen; | 878 | min_cov = dccp_sk(sk)->dccps_pcrlen; |
879 | if (dh->dccph_cscov && (min_cov == 0 || dh->dccph_cscov < min_cov)) { | 879 | if (dh->dccph_cscov && (min_cov == 0 || dh->dccph_cscov < min_cov)) { |
@@ -893,7 +893,7 @@ no_dccp_socket: | |||
893 | goto discard_it; | 893 | goto discard_it; |
894 | /* | 894 | /* |
895 | * Step 2: | 895 | * Step 2: |
896 | * If no socket ... | 896 | * If no socket ... |
897 | * Generate Reset(No Connection) unless P.type == Reset | 897 | * Generate Reset(No Connection) unless P.type == Reset |
898 | * Drop packet and return | 898 | * Drop packet and return |
899 | */ | 899 | */ |