Merge branch 'tip/tracing/core3' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / net / sctp / socket.c

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 71513b3926a5e19a1eed8250988d66f71dbfe714..89ab66e54740240759c8329eb8e7da9ddf2080f9 100644 (file)
--- a/net/sctp/socket.c
+++ b/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;
 }
@@ -2356,8 +2356,8 @@ static int sctp_setsockopt_peer_addr_params(struct sock *sk,
            pmtud_change     == SPP_PMTUD ||
            sackdelay_change == SPP_SACKDELAY ||
            params.spp_sackdelay > 500 ||
-           (params.spp_pathmtu
-           && params.spp_pathmtu < SCTP_DEFAULT_MINSEGMENT))
+           (params.spp_pathmtu &&
+            params.spp_pathmtu < SCTP_DEFAULT_MINSEGMENT))
                return -EINVAL;
 
        /* If an address other than INADDR_ANY is specified, and