diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-12-10 15:39:29 -0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-11 14:34:59 -0800 |
| commit | 1fba78b6cba14bd37fdb12c5367f1e4d58ff2e0f (patch) | |
| tree | dc606497372ac469f698fa2a31d956a67a62d739 /net/dccp/ccids/ccid3.h | |
| parent | 9e8efc824098c241a1cde81f5558d222cb6f9369 (diff) | |
| download | op-kernel-dev-1fba78b6cba14bd37fdb12c5367f1e4d58ff2e0f.zip op-kernel-dev-1fba78b6cba14bd37fdb12c5367f1e4d58ff2e0f.tar.gz | |
[DCCP] ccid3: Fixup some type conversions related to rtts
Spotted by David Miller when compiling on sparc64, I reproduced it here on
parisc64, that are the only platforms to define __kernel_suseconds_t as an
'int', all the others, x86_64 and x86 included typedef it as a 'long', but from
the definition of suseconds_t it should just be an 'int' on platforms where it
is >= 32bits, it would not require all the castings from suseconds_t to (int)
when printking variables of this type, that are not needed on parisc64 and
sparc64.
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to 'net/dccp/ccids/ccid3.h')
| -rw-r--r-- | net/dccp/ccids/ccid3.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h index 3fa0f69..3e3a9cc 100644 --- a/net/dccp/ccids/ccid3.h +++ b/net/dccp/ccids/ccid3.h @@ -52,12 +52,12 @@ #define TFRC_T_MBI 64 /* What we think is a reasonable upper limit on RTT values */ -#define CCID3_SANE_RTT_MAX (4 * USEC_PER_SEC) +#define CCID3_SANE_RTT_MAX ((suseconds_t)(4 * USEC_PER_SEC)) #define CCID3_RTT_SANITY_CHECK(rtt) do { \ if (rtt > CCID3_SANE_RTT_MAX) { \ - DCCP_CRIT("RTT (%ld) too large, substituting %ld", \ - rtt, CCID3_SANE_RTT_MAX); \ + DCCP_CRIT("RTT (%d) too large, substituting %d", \ + (int)rtt, (int)CCID3_SANE_RTT_MAX); \ rtt = CCID3_SANE_RTT_MAX; \ } } while (0) |
