diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-20 01:19:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-20 01:19:26 -0500 |
| commit | 18a4144028f056b77d6576d4eb284246e9c7ea97 (patch) | |
| tree | 85277bf6b49982753d762d58a14aa642e79c037e /net/sctp/sm_sideeffect.c | |
| parent | 02829f73774fa1f6c0a28f4018caaa7c94399c4a (diff) | |
| parent | 4f2d7680cb1ac5c5a70f3ba2447d5aa5c0a1643a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sctp/sm_sideeffect.c')
| -rw-r--r-- | net/sctp/sm_sideeffect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index b8b38aba92b3..8d1dc24bab4c 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c | |||
| @@ -1300,7 +1300,7 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, | |||
| 1300 | "T1 INIT Timeout adjustment" | 1300 | "T1 INIT Timeout adjustment" |
| 1301 | " init_err_counter: %d" | 1301 | " init_err_counter: %d" |
| 1302 | " cycle: %d" | 1302 | " cycle: %d" |
| 1303 | " timeout: %d\n", | 1303 | " timeout: %ld\n", |
| 1304 | asoc->init_err_counter, | 1304 | asoc->init_err_counter, |
| 1305 | asoc->init_cycle, | 1305 | asoc->init_cycle, |
| 1306 | asoc->timeouts[SCTP_EVENT_TIMEOUT_T1_INIT]); | 1306 | asoc->timeouts[SCTP_EVENT_TIMEOUT_T1_INIT]); |
| @@ -1328,7 +1328,7 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, | |||
| 1328 | SCTP_DEBUG_PRINTK( | 1328 | SCTP_DEBUG_PRINTK( |
| 1329 | "T1 COOKIE Timeout adjustment" | 1329 | "T1 COOKIE Timeout adjustment" |
| 1330 | " init_err_counter: %d" | 1330 | " init_err_counter: %d" |
| 1331 | " timeout: %d\n", | 1331 | " timeout: %ld\n", |
| 1332 | asoc->init_err_counter, | 1332 | asoc->init_err_counter, |
| 1333 | asoc->timeouts[SCTP_EVENT_TIMEOUT_T1_COOKIE]); | 1333 | asoc->timeouts[SCTP_EVENT_TIMEOUT_T1_COOKIE]); |
| 1334 | 1334 | ||