diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 37d73a01097edd40928096f50ede0be4e60e658f..c6d52301a6b0804349380c52325f5146b776603d 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c @@ -4272,8 +4272,7 @@ sctp_disposition_t sctp_sf_t1_timer_expire(const struct sctp_endpoint *ep, SCTP_DEBUG_PRINTK("Timer T1 expired.\n"); - if ((timeout < asoc->max_init_timeo) && - (attempts < asoc->max_init_attempts)) { + if (attempts < asoc->max_init_attempts) { switch (timer) { case SCTP_EVENT_TIMEOUT_T1_INIT: bp = (struct sctp_bind_addr *) &asoc->base.bind_addr; diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 2168f68ae65e93540b5cbe878bebf4dc594f6f24..5efabc568edf476a287deba8690cae0f01930394 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -686,7 +686,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp, u32 *authp) u32 *reject_stat = resv->iov_base; int ret; - dprintk("RPC: svcauth_gss: argv->iov_len = %d\n",argv->iov_len); + dprintk("RPC: svcauth_gss: argv->iov_len = %zd\n",argv->iov_len); *authp = rpc_autherr_badcred; if (!svcdata)