diff options
author | Clark Williams <williams@redhat.com> | 2012-01-03 10:47:33 -0600 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-01-03 10:47:33 -0600 |
commit | 63076d7f7f7f2650e5d0a4fa5dd2c412a255c237 (patch) | |
tree | a489c1de793736fb0b379713245467f4358215fe /net/sctp/socket.c | |
parent | 8645bee979600b0ba2ce7bfc847688abd1c2d477 (diff) | |
parent | 5f0a6e2d503896062f641639dacfe5055c2f593b (diff) |
Merge commit 'v3.2-rc7' into rt-3.2-rc7-rt9
Diffstat (limited to 'net/sctp/socket.c')
-rw-r--r-- | net/sctp/socket.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 13bf5fcdbff1..54a7cd2fdd7a 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -2200,8 +2200,6 @@ static int sctp_setsockopt_autoclose(struct sock *sk, char __user *optval, return -EINVAL; if (copy_from_user(&sp->autoclose, optval, optlen)) return -EFAULT; - /* make sure it won't exceed MAX_SCHEDULE_TIMEOUT */ - sp->autoclose = min_t(long, sp->autoclose, MAX_SCHEDULE_TIMEOUT / HZ); return 0; } |