---

yaml --- r: 179076 b: refs/heads/master c: 8ffd320 h: refs/heads/master v: v3
git-mirror · Jan 4, 2010 · 8f32571 · 8f32571
1 parent 8ccfc5c
commit 8f32571
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f731b63752dac76ff4dbf568a08ff2e3663316f
+refs/heads/master: 8ffd32083c849dcf476e56e6c5f728c80797ecdd
diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c
@@ -2087,8 +2087,7 @@ static int sctp_setsockopt_autoclose(struct sock *sk, char __user *optval,
 	if (copy_from_user(&sp->autoclose, optval, optlen))
 		return -EFAULT;
 	/* make sure it won't exceed MAX_SCHEDULE_TIMEOUT */
-	if (sp->autoclose > (MAX_SCHEDULE_TIMEOUT / HZ) )
-		sp->autoclose = (__u32)(MAX_SCHEDULE_TIMEOUT / HZ) ;
+	sp->autoclose = min_t(long, sp->autoclose, MAX_SCHEDULE_TIMEOUT / HZ);
 
 	return 0;
 }