Merge http://linux.bkbits.net/linux-2.5

into debian.org:/usr/src/kernel/ieee1394-2.6

Merge http://linux.bkbits.net/linux-2.5
into debian.org:/usr/src/kernel/ieee1394-2.6
713d8db7 · Ben Collins · a42571a8 · 49b5de25 · 713d8db7 · 713d8db7
Commit 713d8db7 authored Feb 27, 2004 by Ben Collins
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

Makefile Makefile +2 -2

net/sctp/sm_statefuns.c net/sctp/sm_statefuns.c +1 -2

net/sunrpc/auth_gss/svcauth_gss.c net/sunrpc/auth_gss/svcauth_gss.c +1 -1

No files found.
--- a/Makefile
+++ b/Makefile
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 3
+SUBLEVEL = 4
-EXTRAVERSION =
+EXTRAVERSION =-rc1
 NAME=Feisty Dunnart
 # *DOCUMENTATION*

--- 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) &&
+	if (attempts < asoc->max_init_attempts) {
-	    (attempts < asoc->max_init_attempts)) {
 		switch (timer) {
 		case SCTP_EVENT_TIMEOUT_T1_INIT:
 			bp = (struct sctp_bind_addr *) &asoc->base.bind_addr;

--- 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)