diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 18:13:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 18:13:53 -0400 |
| commit | 90ca9a2ff4d6b89b6939c3ece19f8fed1eecdbab (patch) | |
| tree | c671df0bd9fa1a13da69ec57e3fdda1385e59729 /net/dccp | |
| parent | 2c87e2cd0b57f63c226cd51f55ccc36867541a24 (diff) | |
| parent | 9faefb6d41f770e9cebad0fa180e7e78ef861211 (diff) | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD
* HEAD:
[DCCP]: Fix sparse warnings.
[TCP]: Remove TCP Compound
[BPQ] lockdep: fix false positive
[IPV4] inetpeer: Get rid of volatile from peer_total
[AX.25]: Get rid of the last volatile.
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/proto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index f4f0627ea4..6f14bb5a28 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
| @@ -484,7 +484,7 @@ static int do_dccp_setsockopt(struct sock *sk, int level, int optname, | |||
| 484 | err = -EINVAL; | 484 | err = -EINVAL; |
| 485 | else | 485 | else |
| 486 | err = dccp_setsockopt_change(sk, DCCPO_CHANGE_L, | 486 | err = dccp_setsockopt_change(sk, DCCPO_CHANGE_L, |
| 487 | (struct dccp_so_feat *) | 487 | (struct dccp_so_feat __user *) |
| 488 | optval); | 488 | optval); |
| 489 | break; | 489 | break; |
| 490 | 490 | ||
| @@ -493,7 +493,7 @@ static int do_dccp_setsockopt(struct sock *sk, int level, int optname, | |||
| 493 | err = -EINVAL; | 493 | err = -EINVAL; |
| 494 | else | 494 | else |
| 495 | err = dccp_setsockopt_change(sk, DCCPO_CHANGE_R, | 495 | err = dccp_setsockopt_change(sk, DCCPO_CHANGE_R, |
| 496 | (struct dccp_so_feat *) | 496 | (struct dccp_so_feat __user *) |
| 497 | optval); | 497 | optval); |
| 498 | break; | 498 | break; |
| 499 | 499 | ||