---

yaml --- r: 7545 b: refs/heads/master c: 9261c9b h: refs/heads/master i: 7543: 3a202d6 v: v3
git-mirror · Sep 6, 2005 · f5a70b8 · f5a70b8
1 parent 497a3e3
commit f5a70b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe2d5295a11e2ab2d6f4e7ea074816000b32eba3
+refs/heads/master: 9261c9b042547d01eeb206cf0e21ce72832245ec
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
@@ -341,11 +341,11 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
 				sock_reset_flag(sk, SOCK_LINGER);
 			else {
 #if (BITS_PER_LONG == 32)
-				if (ling.l_linger >= MAX_SCHEDULE_TIMEOUT/HZ)
+				if ((unsigned int)ling.l_linger >= MAX_SCHEDULE_TIMEOUT/HZ)
 					sk->sk_lingertime = MAX_SCHEDULE_TIMEOUT;
 				else
 #endif
-					sk->sk_lingertime = ling.l_linger * HZ;
+					sk->sk_lingertime = (unsigned int)ling.l_linger * HZ;
 				sock_set_flag(sk, SOCK_LINGER);
 			}
 			break;