Commit 607bd7f4 authored by Jon Grimm's avatar Jon Grimm

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

into touki.austin.ibm.com:/home/jgrimm/bk/lksctp-2.5.work
parents 0ca1314c 146b6f89
...@@ -417,6 +417,10 @@ static inline __s32 sctp_jitter(__u32 rto) ...@@ -417,6 +417,10 @@ static inline __s32 sctp_jitter(__u32 rto)
static __u32 sctp_rand; static __u32 sctp_rand;
__s32 ret; __s32 ret;
/* Avoid divide by zero. */
if (!rto)
rto = 1;
sctp_rand += jiffies; sctp_rand += jiffies;
sctp_rand ^= (sctp_rand << 12); sctp_rand ^= (sctp_rand << 12);
sctp_rand ^= (sctp_rand >> 20); sctp_rand ^= (sctp_rand >> 20);
......
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