git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
dccp
/
proto.c
diff --git
a/net/dccp/proto.c
b/net/dccp/proto.c
index
2e0ee83
..
6f14bb5
100644
(file)
--- a/
net/dccp/proto.c
+++ b/
net/dccp/proto.c
@@
-9,7
+9,6
@@
* published by the Free Software Foundation.
*/
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
#include <linux/dccp.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/dccp.h>
#include <linux/module.h>
#include <linux/types.h>
@@
-485,7
+484,7
@@
static int do_dccp_setsockopt(struct sock *sk, int level, int optname,
err = -EINVAL;
else
err = dccp_setsockopt_change(sk, DCCPO_CHANGE_L,
err = -EINVAL;
else
err = dccp_setsockopt_change(sk, DCCPO_CHANGE_L,
- (struct dccp_so_feat *)
+ (struct dccp_so_feat
__user
*)
optval);
break;
optval);
break;
@@
-494,7
+493,7
@@
static int do_dccp_setsockopt(struct sock *sk, int level, int optname,
err = -EINVAL;
else
err = dccp_setsockopt_change(sk, DCCPO_CHANGE_R,
err = -EINVAL;
else
err = dccp_setsockopt_change(sk, DCCPO_CHANGE_R,
- (struct dccp_so_feat *)
+ (struct dccp_so_feat
__user
*)
optval);
break;
optval);
break;
@@
-719,7
+718,7
@@
int dccp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
}
dccp_pr_debug("packet_type=%s\n",
dccp_packet_name(dh->dccph_type));
}
dccp_pr_debug("packet_type=%s\n",
dccp_packet_name(dh->dccph_type));
- sk_eat_skb(sk, skb);
+ sk_eat_skb(sk, skb
, 0
);
verify_sock_status:
if (sock_flag(sk, SOCK_DONE)) {
len = 0;
verify_sock_status:
if (sock_flag(sk, SOCK_DONE)) {
len = 0;
@@
-773,7
+772,7
@@
verify_sock_status:
}
found_fin_ok:
if (!(flags & MSG_PEEK))
}
found_fin_ok:
if (!(flags & MSG_PEEK))
- sk_eat_skb(sk, skb);
+ sk_eat_skb(sk, skb
, 0
);
break;
} while (1);
out:
break;
} while (1);
out: