aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ccids
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/ccids
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/ccids')
-rw-r--r--net/dccp/ccids/ccid3.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 0587f52e4af1..86201631fb6e 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -615,7 +615,7 @@ static int ccid3_hc_tx_parse_options(struct sock *sk, unsigned char option,
615 __FUNCTION__, dccp_role(sk), sk); 615 __FUNCTION__, dccp_role(sk), sk);
616 rc = -EINVAL; 616 rc = -EINVAL;
617 } else { 617 } else {
618 opt_recv->ccid3or_loss_event_rate = ntohl(*(u32 *)value); 618 opt_recv->ccid3or_loss_event_rate = ntohl(*(__be32 *)value);
619 ccid3_pr_debug("%s, sk=%p, LOSS_EVENT_RATE=%u\n", 619 ccid3_pr_debug("%s, sk=%p, LOSS_EVENT_RATE=%u\n",
620 dccp_role(sk), sk, 620 dccp_role(sk), sk,
621 opt_recv->ccid3or_loss_event_rate); 621 opt_recv->ccid3or_loss_event_rate);
@@ -636,7 +636,7 @@ static int ccid3_hc_tx_parse_options(struct sock *sk, unsigned char option,
636 __FUNCTION__, dccp_role(sk), sk); 636 __FUNCTION__, dccp_role(sk), sk);
637 rc = -EINVAL; 637 rc = -EINVAL;
638 } else { 638 } else {
639 opt_recv->ccid3or_receive_rate = ntohl(*(u32 *)value); 639 opt_recv->ccid3or_receive_rate = ntohl(*(__be32 *)value);
640 ccid3_pr_debug("%s, sk=%p, RECEIVE_RATE=%u\n", 640 ccid3_pr_debug("%s, sk=%p, RECEIVE_RATE=%u\n",
641 dccp_role(sk), sk, 641 dccp_role(sk), sk,
642 opt_recv->ccid3or_receive_rate); 642 opt_recv->ccid3or_receive_rate);
@@ -777,7 +777,7 @@ static void ccid3_hc_rx_send_feedback(struct sock *sk)
777static void ccid3_hc_rx_insert_options(struct sock *sk, struct sk_buff *skb) 777static void ccid3_hc_rx_insert_options(struct sock *sk, struct sk_buff *skb)
778{ 778{
779 const struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk); 779 const struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk);
780 u32 x_recv, pinv; 780 __be32 x_recv, pinv;
781 781
782 BUG_ON(hcrx == NULL); 782 BUG_ON(hcrx == NULL);
783 783