This puts in a constant for USEC_PER_SEC instead of 1000000. Also
fixing > 80 character lines in a couple of places
Signed-off-by: Ian McDonald <[EMAIL PROTECTED]>
----
diff --git a/net/core/sock.c b/net/core/sock.c
index 6e00811..1d06ec9 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -162,7 +162,8 @@ static int sock_set_timeout(long *timeo_
if (tv.tv_sec == 0 && tv.tv_usec == 0)
return 0;
if (tv.tv_sec < (MAX_SCHEDULE_TIMEOUT/HZ - 1))
- *timeo_p = tv.tv_sec*HZ +
(tv.tv_usec+(1000000/HZ-1))/(1000000/HZ);
+ *timeo_p = tv.tv_sec*HZ +
+ (tv.tv_usec+(USEC_PER_SEC/HZ-1))/(USEC_PER_SEC/HZ);
return 0;
}
@@ -561,7 +562,8 @@ int sock_getsockopt(struct socket *sock,
v.tm.tv_usec = 0;
} else {
v.tm.tv_sec = sk->sk_rcvtimeo / HZ;
- v.tm.tv_usec = ((sk->sk_rcvtimeo % HZ) *
1000000) / HZ;
+ v.tm.tv_usec = ((sk->sk_rcvtimeo % HZ)
+ * USEC_PER_SEC) / HZ;
}
break;
@@ -572,7 +574,8 @@ int sock_getsockopt(struct socket *sock,
v.tm.tv_usec = 0;
} else {
v.tm.tv_sec = sk->sk_sndtimeo / HZ;
- v.tm.tv_usec = ((sk->sk_sndtimeo % HZ) *
1000000) / HZ;
+ v.tm.tv_usec = ((sk->sk_sndtimeo % HZ)
+ * USEC_PER_SEC) / HZ;
}
break;
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
