diff --git a/[refs] b/[refs] index 54ad865ec7b5..5df5d7b62077 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: acb3cecdf89f9a9f30bf493f07dc5af333b45f8e +refs/heads/master: 810c07194f6ef541625e65b53392e9f605611a1a diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c index 5fa9ac52e137..89ab66e54740 100644 --- a/trunk/net/sctp/socket.c +++ b/trunk/net/sctp/socket.c @@ -2088,7 +2088,7 @@ static int sctp_setsockopt_autoclose(struct sock *sk, char __user *optval, return -EFAULT; /* make sure it won't exceed MAX_SCHEDULE_TIMEOUT */ if (sp->autoclose > (MAX_SCHEDULE_TIMEOUT / HZ) ) - sp->autoclose = MAX_SCHEDULE_TIMEOUT / HZ ; + sp->autoclose = (__u32)(MAX_SCHEDULE_TIMEOUT / HZ) ; return 0; }