Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@kernel.bkbits.net>2004-02-26 21:39:13 -0800
committerDavid S. Miller <davem@kernel.bkbits.net>2004-02-26 21:39:13 -0800
commit638dcbe418cca9e109a6dbc805941126afb63777 (patch)
treedfdba4e91bb2c5c1ba3ec38ce88d921983afd328
parentafc2ce80fa7ef0431d0bc3316ebbc42567fe9fa8 (diff)
parent844d1b9f9dee447aa1613e2203c8666fe1d48be0 (diff)
Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6
into kernel.bkbits.net:/home/davem/net-2.6
-rw-r--r--net/sctp/sm_statefuns.c3
-rw-r--r--net/sunrpc/auth_gss/svcauth_gss.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 37d73a01097e..c6d52301a6b0 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 2168f68ae65e..5efabc568edf 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)