Skip to content

L
linux
Commit 638dcbe4 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6 

into kernel.bkbits.net:/home/davem/net-2.6
parents afc2ce80 844d1b9f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
net/sctp/sm_statefuns.c
View file @ 638dcbe4
...@@ -4272,8 +4272,7 @@ sctp_disposition_t sctp_sf_t1_timer_expire(const struct sctp_endpoint *ep, ...@@ -4272,8 +4272,7 @@ sctp_disposition_t sctp_sf_t1_timer_expire(const struct sctp_endpoint *ep,
SCTP_DEBUG_PRINTK("Timer T1 expired.\n"); 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) { switch (timer) {
case SCTP_EVENT_TIMEOUT_T1_INIT: case SCTP_EVENT_TIMEOUT_T1_INIT:
bp = (struct sctp_bind_addr *) &asoc->base.bind_addr; bp = (struct sctp_bind_addr *) &asoc->base.bind_addr;
......
net/sunrpc/auth_gss/svcauth_gss.c
View file @ 638dcbe4
...@@ -686,7 +686,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp, u32 *authp) ...@@ -686,7 +686,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp, u32 *authp)
u32 *reject_stat = resv->iov_base; u32 *reject_stat = resv->iov_base;
int ret; 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; *authp = rpc_autherr_badcred;
if (!svcdata) if (!svcdata)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7