aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/proto.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/proto.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/proto.c')
-rw-r--r--net/dccp/proto.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 1a8cf8ecfe63..53735ee2bbd1 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -221,7 +221,7 @@ int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg)
221 221
222EXPORT_SYMBOL_GPL(dccp_ioctl); 222EXPORT_SYMBOL_GPL(dccp_ioctl);
223 223
224static int dccp_setsockopt_service(struct sock *sk, const u32 service, 224static int dccp_setsockopt_service(struct sock *sk, const __be32 service,
225 char __user *optval, int optlen) 225 char __user *optval, int optlen)
226{ 226{
227 struct dccp_sock *dp = dccp_sk(sk); 227 struct dccp_sock *dp = dccp_sk(sk);
@@ -349,7 +349,7 @@ int dccp_setsockopt(struct sock *sk, int level, int optname,
349EXPORT_SYMBOL_GPL(dccp_setsockopt); 349EXPORT_SYMBOL_GPL(dccp_setsockopt);
350 350
351static int dccp_getsockopt_service(struct sock *sk, int len, 351static int dccp_getsockopt_service(struct sock *sk, int len,
352 u32 __user *optval, 352 __be32 __user *optval,
353 int __user *optlen) 353 int __user *optlen)
354{ 354{
355 const struct dccp_sock *dp = dccp_sk(sk); 355 const struct dccp_sock *dp = dccp_sk(sk);
@@ -404,7 +404,7 @@ int dccp_getsockopt(struct sock *sk, int level, int optname,
404 break; 404 break;
405 case DCCP_SOCKOPT_SERVICE: 405 case DCCP_SOCKOPT_SERVICE:
406 return dccp_getsockopt_service(sk, len, 406 return dccp_getsockopt_service(sk, len,
407 (u32 __user *)optval, optlen); 407 (__be32 __user *)optval, optlen);
408 case 128 ... 191: 408 case 128 ... 191:
409 return ccid_hc_rx_getsockopt(dp->dccps_hc_rx_ccid, sk, optname, 409 return ccid_hc_rx_getsockopt(dp->dccps_hc_rx_ccid, sk, optname,
410 len, (u32 __user *)optval, optlen); 410 len, (u32 __user *)optval, optlen);