aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ipv4.c
diff options
context:
space:
mode:
authorAndrea Bittau <a.bittau@cs.ucl.ac.uk>2006-03-20 22:23:32 -0500
committerDavid S. Miller <davem@davemloft.net>2006-03-20 22:23:32 -0500
commit60fe62e789076ae7c13f7ffb35fec4b24802530d (patch)
treecc8d507a4276c3d5a2bcb72746660d485bc2e045 /net/dccp/ipv4.c
parenta193a4abdd1f742a57f3f70b6a83c3e536876e97 (diff)
[DCCP]: sparse endianness annotations
This also fixes the layout of dccp_hdr short sequence numbers, problem was not fatal now as we only support long (48 bits) sequence numbers. Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r--net/dccp/ipv4.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index aa7708fed32e..be5ce57b8046 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -498,9 +498,9 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
498 struct dccp_sock dp; 498 struct dccp_sock dp;
499 struct request_sock *req; 499 struct request_sock *req;
500 struct dccp_request_sock *dreq; 500 struct dccp_request_sock *dreq;
501 const __u32 saddr = skb->nh.iph->saddr; 501 const __be32 saddr = skb->nh.iph->saddr;
502 const __u32 daddr = skb->nh.iph->daddr; 502 const __be32 daddr = skb->nh.iph->daddr;
503 const __u32 service = dccp_hdr_request(skb)->dccph_req_service; 503 const __be32 service = dccp_hdr_request(skb)->dccph_req_service;
504 struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb); 504 struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);
505 __u8 reset_code = DCCP_RESET_CODE_TOO_BUSY; 505 __u8 reset_code = DCCP_RESET_CODE_TOO_BUSY;
506 506
@@ -662,8 +662,8 @@ static struct sock *dccp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
662 return sk; 662 return sk;
663} 663}
664 664
665int dccp_v4_checksum(const struct sk_buff *skb, const u32 saddr, 665int dccp_v4_checksum(const struct sk_buff *skb, const __be32 saddr,
666 const u32 daddr) 666 const __be32 daddr)
667{ 667{
668 const struct dccp_hdr* dh = dccp_hdr(skb); 668 const struct dccp_hdr* dh = dccp_hdr(skb);
669 int checksum_len; 669 int checksum_len;
@@ -683,7 +683,7 @@ int dccp_v4_checksum(const struct sk_buff *skb, const u32 saddr,
683} 683}
684 684
685static int dccp_v4_verify_checksum(struct sk_buff *skb, 685static int dccp_v4_verify_checksum(struct sk_buff *skb,
686 const u32 saddr, const u32 daddr) 686 const __be32 saddr, const __be32 daddr)
687{ 687{
688 struct dccp_hdr *dh = dccp_hdr(skb); 688 struct dccp_hdr *dh = dccp_hdr(skb);
689 int checksum_len; 689 int checksum_len;